From ebe8621fd798a568ae33eb6a665cb3c758dd3816 Mon Sep 17 00:00:00 2001 From: Johan Herland Date: Fri, 13 May 2011 18:43:29 +0200 Subject: [PATCH 1/2] 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 b0b2684a1f8..0eace37a03d 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/2] 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 00000000000..2e7b1572105 --- /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 1f849d224e0..430d7f1b628 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