Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Tweak t3102-ls-tree-wildcards to run on Windows
[gitweb.git]
/
t
/
t5520-pull.sh
diff --git
a/t/t5520-pull.sh
b/t/t5520-pull.sh
index 0b489f5b1227268c050c1256d105d57d871f5698..0470a81be0edaf883788d313778ef6865ed34c6f 100755
(executable)
--- a/
t/t5520-pull.sh
+++ b/
t/t5520-pull.sh
@@
-222,4
+222,11
@@
test_expect_success 'git pull --rebase does not reapply old patches' '
)
'
+test_expect_success 'git pull --rebase against local branch' '
+ git checkout -b copy2 to-rebase-orig &&
+ git pull --rebase . to-rebase &&
+ test "conflicting modification" = "$(cat file)" &&
+ test file = "$(cat file2)"
+'
+
test_done