[PATCH 1/2] t5524: test --log=1 limits shortlog length
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
Since efb779f (merge, pull: add '--(no-)log' command line option, 2008-04-06) git-pull supported the (--no-)log switch and would pass it to git-merge. 96e9420 (merge: Make '--log' an integer option for number of shortlog entries, 2010-09-08) implemented support for the --log=<n> switch, which would explicitly set the number of shortlog entries. However, git-pull does not recognize this option, and will instead pass it to git-fetch, leading to "unknown option" errors. Implement a failing test that demonstrates this. Signed-off-by: Paul Tan <redacted> --- t/t5524-pull-msg.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
index 8cccecc..593405d 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_failure '--log=1 limits shortlog length' ' +( + cd cloned && + git reset --hard HEAD^ && + verbose test "$(cat afile)" = original && + verbose test "$(cat bfile)" = added && + git pull --log=1 && + git log -3 && + git cat-file commit HEAD >result && + verbose grep Dollar result && + verbose grep -v "second commit" result +) +' + test_done
--
2.1.4