diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-06-03 11:49:40 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-06-03 11:49:40 +0400 |
commit | 433e972aeb5e485d2f7a7ac605a1c043822e25d9 (patch) | |
tree | 53d39fd7fdbd01c870d08937e805849dd4d6c404 /Documentation | |
parent | a5adcbe377de7c8f5d794fce1fe2b23a0bddf758 (diff) | |
parent | a9b2d42486ee0b461220bf3895114926d9ddf9be (diff) |
Merge branch 'maint'
* maint:
blame: correctly handle a path that used to be a directory
add -i: do not dump patch during application
Update draft release notes for 1.6.3.2
grep: fix colouring of matches with zero length
Documentation: teach stash/pop workflow instead of stash/apply
Change xdl_merge to generate output even for null merges
t6023: merge-file fails to output anything for a degenerate merge
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/RelNotes-1.6.3.2.txt | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/Documentation/RelNotes-1.6.3.2.txt b/Documentation/RelNotes-1.6.3.2.txt index a3fceebb11..0b48d1a1df 100644 --- a/Documentation/RelNotes-1.6.3.2.txt +++ b/Documentation/RelNotes-1.6.3.2.txt @@ -8,44 +8,56 @@ Fixes since v1.6.3.1 casting the (char *) pointer to (int *); GCC 4.4 did not like this, and aborted compilation. - * http-push had a small use-after-free bug. - - * command completion code in bash did not reliably detect that we are - in a bare repository. - - * "git for-each-ref" had a segfaulting bug when dealing with a tag object - created by an ancient git. - * Some unlink(2) failures went undiagnosed. * The "recursive" merge strategy misbehaved when faced rename/delete conflicts while coming up with an intermediate merge base. + * The low-level merge algorithm did not handle a degenerate case of + merging a file with itself using itself as the common ancestor + gracefully. It should produce the file itself, but instead + produced an empty result. + * GIT_TRACE mechanism segfaulted when tracing a shell-quoted aliases. + * OpenBSD also uses st_ctimspec in "struct stat", instead of "st_ctim". + + * With NO_CROSS_DIRECTORY_HARDLINKS, "make install" can be told not to + create hardlinks between $(gitexecdir)/git-$builtin_commands and + $(bindir)/git. + + * command completion code in bash did not reliably detect that we are + in a bare repository. + * "git add ." in an empty directory complained that pathspec "." did not match anything, which may be technically correct, but not useful. We silently make it a no-op now. + * "git add -p" (and "patch" action in "git add -i") was broken when + the first hunk that adds a line at the top was split into two and + both halves are marked to be used. + + * "git for-each-ref" had a segfaulting bug when dealing with a tag object + created by an ancient git. + * "git format-patch -k" still added patch numbers if format.numbered configuration was set. - * OpenBSD also uses st_ctimspec in "struct stat", instead of "st_ctim". + * "git grep --color ''" did not terminate. - * With NO_CROSS_DIRECTORY_HARDLINKS, "make install" can be told not to - create hardlinks between $(gitexecdir)/git-$builtin_commands and - $(bindir)/git. + * http-push had a small use-after-free bug. * "git push" was converting OFS_DELTA pack representation into less efficient REF_DELTA representation unconditionally upon transfer, making the transferred data unnecessarily larger. + * "git remote show origin" segfaulted when origin was still empty. + Many other general usability updates around help text, diagnostic messages and documentation are included as well. --- exec >/var/tmp/1 -O=v1.6.3.1-51-g2a1feb9 +O=v1.6.3.1-68-g456cb4c echo O=$(git describe maint) git shortlog --no-merges $O..maint - |