From ebe8621fd798a568ae33eb6a665cb3c758dd3816 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Fri, 13 May 2011 18:43:29 +0200 Subject: [PATCH 1/3] t5400: Fix a couple of typos Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano --- t/t5400-send-pack.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index b0b2684a1f..0eace37a03 100755 --- a/t/t5400-send-pack.sh +++ b/t/t5400-send-pack.sh @@ -190,7 +190,7 @@ test_expect_success 'pushing explicit refspecs respects forcing' ' +refs/heads/master:refs/heads/master ) && parent_head=$(cd parent && git rev-parse --verify master) && - child_head=$(cd parent && git rev-parse --verify master) && + child_head=$(cd child && git rev-parse --verify master) && test "$parent_head" = "$child_head" ' @@ -210,7 +210,7 @@ test_expect_success 'pushing wildcard refspecs respects forcing' ' "+refs/heads/*:refs/heads/*" ) && parent_head=$(cd parent && git rev-parse --verify master) && - child_head=$(cd parent && git rev-parse --verify master) && + child_head=$(cd child && git rev-parse --verify master) && test "$parent_head" = "$child_head" ' From 375f8a032e9f47d362afd5ea2443f77bcba685cb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 May 2011 10:57:09 -0700 Subject: [PATCH 2/3] Prepare for 1.7.5.2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.5.2.txt | 33 ++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.5.2.txt diff --git a/Documentation/RelNotes/1.7.5.2.txt b/Documentation/RelNotes/1.7.5.2.txt new file mode 100644 index 0000000000..2e7b157210 --- /dev/null +++ b/Documentation/RelNotes/1.7.5.2.txt @@ -0,0 +1,33 @@ +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 merge-one-file" did not honor GIT_WORK_TREE settings when + handling a "both sides added, differently" conflict. + + * "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/RelNotes b/RelNotes index 1f849d224e..430d7f1b62 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.5.1.txt \ No newline at end of file +Documentation/RelNotes/1.7.5.2.txt \ No newline at end of file From 2de58b398b5a1f81bf74a385e41cfc2fcd9cb427 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 13 May 2011 11:14:07 -0700 Subject: [PATCH 3/3] Update draft release notes to 1.7.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.6.txt | 46 +++++++++++--------------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index f73a7b23df..42b1823093 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -18,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. @@ -53,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. @@ -70,17 +71,14 @@ included in this release. one of them was given to the editor. (merge jc/maint-add-p-overlapping-hunks 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 config" used to choke with an insanely long line. (merge ef/maint-strbuf-init 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 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) @@ -95,27 +93,15 @@ included in this release. configuration variables such as merge.ff, merge.log, etc. (merge jc/maint-branch-mergeoptions later) - * "git merge-one-file" did not honor GIT_WORK_TREE settings when - handling a "both sides added, differently" conflict. - (merge jk/merge-one-file-working-tree 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 stash -p --no-keep-index" and "git stash --no-keep-index -p" now - mean the same thing. - (merge dm/stash-k-i-p later) - - * "git upload-pack" (hence "git push" over git native protocol) had a - subtle race condition that could lead to a deadlock. - (merge jk/maint-upload-pack-shallow later) + * "git send-pack" (hence "git push") over smalt-HTTP protocol could + deadlock when the client side pack-object died early. + (merge js/maint-send-pack-stateless-rpc-deadlock-fix later) --- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.5.1-248-ga579498 +O=v1.7.5.1-288-ge4ae6ef git shortlog --no-merges ^maint ^$O master