git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5504f13)
t5520: check reflog action in fast-forward merge
authorPaul Tan <redacted>
Fri, 29 May 2015 11:44:45 +0000 (19:44 +0800)
committerJunio C Hamano <redacted>
Fri, 29 May 2015 16:16:11 +0000 (09:16 -0700)
commit80ea984da6c585ca4d63de0d8a2ce2873448e228
tree31619eddc42a15d0afdd3dc39eedb248691a76a2tree | snapshot
parent5504f13a7c1e0a0ed486aecfdcc45b150528693ecommit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t5520-pull.sh diff | blob | history
git clone https://git.99rst.org/PROJECT