diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-29 11:44:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-29 16:16:11 (GMT) |
| commit | 80ea984da6c585ca4d63de0d8a2ce2873448e228 (patch) | |
| tree | 31619eddc42a15d0afdd3dc39eedb248691a76a2 /t/t5520-pull.sh | |
| parent | 5504f13a7c1e0a0ed486aecfdcc45b150528693e (diff) | |
| download | git-80ea984da6c585ca4d63de0d8a2ce2873448e228.zip git-80ea984da6c585ca4d63de0d8a2ce2873448e228.tar.gz git-80ea984da6c585ca4d63de0d8a2ce2873448e228.tar.bz2 | |
t5520: check reflog action in fast-forward merge
When testing a fast-forward merge with git-pull, check to see if the
reflog action is "pull" with the arguments passed to git-pull.
While we are in the vicinity, remove the empty line as well.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index a04f55c..af31f04 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -86,7 +86,6 @@ test_expect_success 'pulling into void must not create an octopus' ' ' test_expect_success 'test . as a remote' ' - git branch copy master && git config branch.copy.remote . && git config branch.copy.merge refs/heads/master && @@ -95,7 +94,11 @@ test_expect_success 'test . as a remote' ' git checkout copy && test "$(cat file)" = file && git pull && - test "$(cat file)" = updated + test "$(cat file)" = updated && + git reflog -1 >reflog.actual && + sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy && + echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected && + test_cmp reflog.expected reflog.fuzzy ' test_expect_success 'the default remote . should not break explicit pull' ' @@ -106,7 +109,11 @@ test_expect_success 'the default remote . should not break explicit pull' ' git reset --hard HEAD^ && test "$(cat file)" = file && git pull . second && - test "$(cat file)" = modified + test "$(cat file)" = modified && + git reflog -1 >reflog.actual && + sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy && + echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected && + test_cmp reflog.expected reflog.fuzzy ' test_expect_success 'fail if wildcard spec does not match any refs' ' |