diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:24:43 -0700 |
| commit | 14230580af96353b911ec1de85517d71c8cfe6b8 (patch) | |
| tree | b99bb8d1efbd885b3243cf7b32a4c1773853b5a5 /t | |
| parent | Merge branch 'jk/rerere-forget-check-enabled' (diff) | |
| parent | pull: handle --log=<n> (diff) | |
| download | tgif-14230580af96353b911ec1de85517d71c8cfe6b8.tar.xz | |
Merge branch 'pt/pull-log-n'
"git pull --log" and "git pull --no-log" worked as expected, but
"git pull --log=20" did not.
* pt/pull-log-n:
pull: handle --log=<n>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5524-pull-msg.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh index 8cccecc2fc..c278adaa5a 100755 --- a/t/t5524-pull-msg.sh +++ b/t/t5524-pull-msg.sh @@ -17,6 +17,9 @@ test_expect_success setup ' git commit -m "add bfile" ) && test_tick && test_tick && + echo "second" >afile && + git add afile && + git commit -m "second commit" && echo "original $dollar" >afile && git add afile && git commit -m "do not clobber $dollar signs" @@ -32,4 +35,18 @@ test_expect_success pull ' ) ' +test_expect_success '--log=1 limits shortlog length' ' +( + cd cloned && + git reset --hard HEAD^ && + test "$(cat afile)" = original && + test "$(cat bfile)" = added && + git pull --log=1 && + git log -3 && + git cat-file commit HEAD >result && + grep Dollar result && + ! grep "second commit" result +) +' + test_done |