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.0.1
[platform/upstream/git.git]
/
t
/
t9163-git-svn-reset-clears-caches.sh
diff --git
a/t/t9163-git-svn-reset-clears-caches.sh
b/t/t9163-git-svn-reset-clears-caches.sh
index
cd4c662
..
d6245ce
100755
(executable)
--- a/
t/t9163-git-svn-reset-clears-caches.sh
+++ b/
t/t9163-git-svn-reset-clears-caches.sh
@@
-70,9
+70,9
@@
test_expect_success 'rebase looses SVN merge (m)' '
#
test_expect_success 'reset and fetch gets the SVN merge (m) correctly' '
git svn reset -r 3 &&
#
test_expect_success 'reset and fetch gets the SVN merge (m) correctly' '
git svn reset -r 3 &&
- git reset --hard trunk &&
+ git reset --hard
origin/
trunk &&
git svn fetch &&
git svn fetch &&
- test 2 = $(git cat-file -p trunk|grep parent|wc -l)
+ test 2 = $(git cat-file -p
origin/
trunk|grep parent|wc -l)
'
test_done
'
test_done