development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse source 
* maint:
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos

Conflicts:
	RelNotes
This commit is contained in:
Junio C Hamano 2011-05-13 10:58:10 -07:00
parent 240fe0505f 375f8a032e
commit 32341b9df5
2 changed files with 35 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Documentation/RelNotes/1.7.5.2.txt Normal file
View file

@ -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.

4
t/t5400-send-pack.sh
View file

@ -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"
'