Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Second batch for 2.1
[gitweb.git]
/
t
/
t9165-git-svn-fetch-merge-branch-of-branch.sh
diff --git
a/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
b/t/t9165-git-svn-fetch-merge-branch-of-branch.sh
index 13ae7e33f9de5402eaab7b41d277d1d7b1289c54..fa3ef3b1f7408840cabc5eacb1b1851f1c8afaac 100755
(executable)
--- a/
t/t9165-git-svn-fetch-merge-branch-of-branch.sh
+++ b/
t/t9165-git-svn-fetch-merge-branch-of-branch.sh
@@
-53,7
+53,7
@@
test_expect_success 'clone svn repo' '
'
test_expect_success 'verify merge commit' 'x=$(git rev-parse HEAD^2) &&
- y=$(git rev-parse branch2) &&
+ y=$(git rev-parse
origin/
branch2) &&
test "x$x" = "x$y"
'