From: Junio C Hamano Date: Sun, 15 May 2011 23:30:13 +0000 (-0700) Subject: Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming X-Git-Tag: v1.7.7-rc0~115^2~13 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02071b27f1587c65ddc4779017a3ddceb777de9c?hp=5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 Merge branches 'jc/convert', 'jc/bigfile' and 'jc/replacing' into jc/streaming * jc/convert: convert: make it harder to screw up adding a conversion attribute convert: make it safer to add conversion attributes convert: give saner names to crlf/eol variables, types and functions convert: rename the "eol" global variable to "core_eol" * jc/bigfile: Bigfile: teach "git add" to send a large file straight to a pack index_fd(): split into two helper functions index_fd(): turn write_object and format_check arguments into one flag * jc/replacing: read_sha1_file(): allow selective bypassing of replacement mechanism inline lookup_replace_object() calls read_sha1_file(): get rid of read_sha1_file_repl() madness t6050: make sure we test not just commit replacement Declare lookup_replace_object() in cache.h, not in commit.h --- diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt new file mode 100644 index 0000000000..b985b07da5 --- /dev/null +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -0,0 +1,42 @@ +Git v1.7.5.2 Release Notes +========================== + +The release notes to 1.7.5.1 forgot to mention: + + * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now + mean the same thing. + + * "git upload-pack" (hence "git push" over git native protocol) had a + subtle race condition that could lead to a deadlock. + +Fixes since v1.7.5.1 +-------------------- + + * "git cvsimport" did not know that CVSNT stores its password file in a + location different from the traditional CVS. + + * "git diff-files" did not show the mode information from the working + tree side of an unmerged path correctly. + + * "git diff -M --cached" used to use unmerged path as a possible rename + source candidate, which made no sense. + + * "git format-patch" did not quote RFC822 special characters in the + email address (e.g From: Junio C. Hamano , not + From: "Junio C. Hamano" ). + + * "git format-patch" when run with "--quiet" option used to produce a + nonsense result that consists of alternating empty output. + + * "git merge-one-file" did not honor GIT_WORK_TREE settings when + handling a "both sides added, differently" conflict. + + * "git mergetool" did not handle conflicted submoudules gracefully. + + * "git-p4" (in contrib) used a wrong base image while merge a file that + was added on both branches differently. + + * "git rebase -i -p" failed to preserve the history when there is a + redundant merge created with the --no-ff option. + +And other minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index 8554918cf4..f644378d21 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -6,6 +6,8 @@ Updates since v1.7.5 * Various git-svn updates. + * Updates the way content tags are handled in gitweb. + * Clean-up of the C part of i18n (but not l10n---please wait) continues. @@ -16,14 +18,18 @@ Updates since v1.7.5 * "git blame" learned "--abbrev[=]" option to control the minimum number of hexdigits shown for commit object names. - * "git cvsimport" learned that CVSNT stores its password file in a - location different from the traditional CVS. - * "git diff -C -C" used to disable the rename detection entirely when there are too many copy candidate paths in the tree; now it falls back to "-C" when doing so would keep the copy candidate paths under the rename detection limit. + * "git diff" and its family of commands learned --dirstat=0 to show + directories that contribute less than 0.1% of changes. + + * "git diff" and its family of commands learned --dirstat=lines mode to + assess damage to the directory based on number of lines in the patch + output, not based on the similarity numbers. + * "git format-patch" learned "--quiet" option to suppress the output of the names of generated files. @@ -38,8 +44,8 @@ Updates since v1.7.5 * "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works. - * "git merge-one-file" learned to honor GIT_WORK_TREE settings when - handling "both sides added, differently" conflict. + * "git rebase" that does not specify on top of which branch to rebase + the current branch now uses @{upstream} of the current branch. * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked commits separately, producing more a useful output. @@ -51,9 +57,6 @@ Updates since v1.7.5 the tarball generation; snapshot from the same tree should result in a same tarball. - * "git-p4" (in contrib) learned to merge a file that was added on both - branches differently by using 2-way merge. - Also contains various documentation updates and minor miscellaneous changes. @@ -64,43 +67,29 @@ Fixes since v1.7.5 Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are included in this release. - * "git config" used to choke with an insanely long line. - (merge ef/maint-strbuf-init later) + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + (merge jc/maint-add-p-overlapping-hunks later) - * "git diff-files" did not show the mode information from the working - tree side of an unmerged path correctly. - (merge jc/fix-diff-files-unmerged later) + * "git add -u" did not resolve a conflict where our history deleted and + their history modified the same file, and the working tree resolved to + keep a file. + (merge jc/fix-add-u-unmerged later) - * "git diff -M --cached" used to use unmerged path as a possible rename - source candidate, which made no sense. - (merge mz/maint-rename-unmerged later) - - * "git format-patch" when run with "--quiet" option used to produce a - nonsense result that consists of alternating empty output. - (merge early part of cn/format-patch-quiet later) - - * "git format-patch" did not quote RFC822 special characters in the - email address (e.g From: Junio C. Hamano , not - From: "Junio C. Hamano" ). - (merge jk/format-patch-quote-special-in-from later) - - * "git mergetool" did not handle conflicted submoudules gracefully. - (merge jm/mergetool-submodules later) - - * "git rebase -i -p" failed to preserve the history when there is a - redundant merge created with the --no-ff option. - (merge aw/maint-rebase-i-p-no-ff later) + * "git config" used to choke with an insanely long line. + (merge ef/maint-strbuf-init later) - * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now - mean the same thing. - (merge dm/stash-k-i-p later) + * In "git merge", per-branch branch..mergeoptions configuration + variables did not override the fallback default merge.