summaryrefslogtreecommitdiff
path: root/t/t5520-pull.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-12 21:49:51 -0800
commit73fd7f3761eeef0e28bbf04727c8a1e751a9792e (patch)
treeee4e1e60de8c67ac5d83148b3880f14bf2d2f024 /t/t5520-pull.sh
parentMerge branch 'mz/maint-rebase-stat-config' (diff)
parentUse reflog in 'pull --rebase . foo' (diff)
downloadtgif-73fd7f3761eeef0e28bbf04727c8a1e751a9792e.tar.xz
Merge branch 'mz/pull-rebase-rebased'
* mz/pull-rebase-rebased: Use reflog in 'pull --rebase . foo'
Diffstat (limited to 't/t5520-pull.sh')
-rwxr-xr-xt/t5520-pull.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 0b489f5b12..0470a81be0 100755
--- 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