|
|
|
@ -103,64 +103,3 @@ details).
@@ -103,64 +103,3 @@ details).
|
|
|
|
|
use "$PERL_PATH", the version of Perl the user told Git to use, in |
|
|
|
|
our tests to avoid unnecessary breakages in tests. |
|
|
|
|
(merge ad78585 vr/use-our-perl-in-tests later to maint). |
|
|
|
|
|
|
|
|
|
* "git blame" did not try to make sure that the abbreviated commit |
|
|
|
|
object names in its output are unique. |
|
|
|
|
(merge b31272f jc/maint-blame-unique-abbrev later to maint). |
|
|
|
|
|
|
|
|
|
* On Cygwin, the platform pread(2) is not thread safe, just like our |
|
|
|
|
own compat/ emulation, and cannot be used in the index-pack |
|
|
|
|
program. Makefile variable NO_THREAD_SAFE_PREAD can be defined to |
|
|
|
|
avoid use of this function in a threaded program. |
|
|
|
|
(merge c0f8654 rj/platform-pread-may-be-thread-unsafe later to maint). |
|
|
|
|
|
|
|
|
|
* "git clone --single-branch" to clone a single branch did not limit |
|
|
|
|
the cloning to the specified branch. |
|
|
|
|
(merge 0ec4b16 nd/clone-single-fix later to maint). |
|
|
|
|
|
|
|
|
|
* "git diff --no-index" did not correctly handle relative paths and |
|
|
|
|
did not correctly give exit codes when run under "--quiet" option. |
|
|
|
|
(merge 304970d th/diff-no-index-fixes later to maint). |
|
|
|
|
|
|
|
|
|
* When "git log" gets "--simplify-merges/by-decoration" together with |
|
|
|
|
"--first-parent", the combination of these options makes the |
|
|
|
|
simplification logic to use in-core commit objects that haven't |
|
|
|
|
been examined for relevance, either producing incorrect result or |
|
|
|
|
taking too long to produce any output. Teach the simplification |
|
|
|
|
logic to ignore commits that the first-parent traversal logic |
|
|
|
|
ignored when both are in effect to work around the issue. |
|
|
|
|
(merge 6e513ba jc/rev-list-simplify-merges-first-parent later to maint). |
|
|
|
|
|
|
|
|
|
* "git add" allows adding a regular file to the path where a |
|
|
|
|
submodule used to exist, but "git update-index" does not allow an |
|
|
|
|
equivalent operation to Porcelain writers. |
|
|
|
|
(merge 242f55f hv/submodule-update-nuke-submodules later to maint). |
|
|
|
|
|
|
|
|
|
* "git diff --no-index" did not work with pagers correctly. |
|
|
|
|
(merge af63b54 jk/diff-no-index-pager later to maint). |
|
|
|
|
|
|
|
|
|
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that |
|
|
|
|
claimed that the treeish HEAD did not have COPYING in it. |
|
|
|
|
(merge 023e37c mm/verify-filename-fix later to maint). |
|
|
|
|
|
|
|
|
|
* The documentation for "git cherry-pick A B..C" was misleading. |
|
|
|
|
(merge b98878e cn/cherry-pick-range-docs later to maint). |
|
|
|
|
|
|
|
|
|
* "git archive" incorrectly computed the header checksum; the symptom |
|
|
|
|
was observed only when using pathnames with hi-bit set. |
|
|
|
|
(merge a5a46eb jc/ustar-checksum-is-unsigned later to maint). |
|
|
|
|
|
|
|
|
|
* Running "git bundle verify" on a bundle that records a complete |
|
|
|
|
history said "it requires these 0 commits". |
|
|
|
|
(merge 8c3710f jc/bundle-complete-notice later to maint). |
|
|
|
|
|
|
|
|
|
* "git ls-files --exclude=t -i" did not consider anything under t/ as |
|
|
|
|
excluded, as it did not pay attention to exclusion of leading paths |
|
|
|
|
while walking the index. Other two users of excluded() are also |
|
|
|
|
updated. |
|
|
|
|
(merge 0d316f0 jc/ls-files-i-dir later to maint). |
|
|
|
|
|
|
|
|
|
* "git request-pull $url dev" when the tip of "dev" branch was tagged |
|
|
|
|
with "ext4-for-linus" used the contents from the tag in the output |
|
|
|
|
but still asked the "dev" branch to be pulled, not the tag. |
|
|
|
|
(merge 682853e jc/request-pull-match-tagname later to maint). |
|
|
|
|