Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
[gitweb.git]
/
t
/
t9166-git-svn-fetch-merge-branch-of-branch2.sh
diff --git
a/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
b/t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
index af0ec0e2e3d6508f9a65c250f7db40bec5c1a756..52f2e46a5b4d393ce8783584f075a5b17ff36d70 100755
(executable)
--- a/
t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
+++ b/
t/t9166-git-svn-fetch-merge-branch-of-branch2.sh
@@
-46,7
+46,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"
'