projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Imported Upstream version 2.11.4
[platform/upstream/git.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
13ae7e3
..
fa3ef3b
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"
'