[PATCH v2 11/12] t5524: test --log=1 limits shortlog length
flat view
STALE3773d
From: Paul Tan <hidden>
Date: 2016-06-15 23:04:40
Subsystem:
the rest · Maintainer:
Linus Torvalds
While git-pull supports --log and passes the switch to git-merge, it
does not support --log=<n>, ignoring the value <n>.
This is not only at odds with the documentation of git-pull, it's also a
undesirable limitation as <n> could simply be passed to git-merge as
well.
Implement a failing test that demonstrates this.
Signed-off-by: Paul Tan <redacted>
---
Notes:
* Added this test to the patch series
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..5b7af07 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^ && + test `cat afile` = original && + test `cat bfile` = added && + git pull --log && + git log -3 && + git cat-file commit HEAD >result && + grep Dollar result && + ! grep "second commit" result +) +' + test_done
--
2.1.4