On Mon, May 18, 2015 at 10:53 PM, Johannes Schindelin
<[email protected]> wrote:
> On 2015-05-18 15:39, Paul Tan wrote:
>> diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
>> index 8cccecc..eebb8c9 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 &&
>
> I completely forgot to send a mail last time where I wanted to mention the
> test_commit function. I *think* that above invocation is equivalent to
>
> test_commit "second commit" afile second
>
> with the additional benefit that `test_tick` is called automatically. Maybe
> you want to use that more concise function call?
Hmm, it says that 'second commit' is not a valid tag name ;-) Okay, I can work
around it by making the commit message "second".
On another note though, I think I need to add a "test_tick" for the commit just
below as well:
echo "original $dollar" >afile &&
git add afile &&c
git commit -m "do not clobber $dollar signs"
So, here's the re-rolled patch.
--- >8 ---
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.
Fix this by matching --log=* in addition to --log and --no-log.
Implement a test for this use case.
Signed-off-by: Paul Tan <[email protected]>
---
git-pull.sh | 4 ++--
t/t5524-pull-msg.sh | 18 +++++++++++++++++-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 9ed01fd..5ff4545 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -81,8 +81,8 @@ do
diffstat=--no-stat ;;
--stat|--summary)
diffstat=--stat ;;
- --log|--no-log)
- log_arg=$1 ;;
+ --log|--log=*|--no-log)
+ log_arg="$1" ;;
--no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit)
no_commit=--no-commit ;;
--c|--co|--com|--comm|--commi|--commit)
diff --git a/t/t5524-pull-msg.sh b/t/t5524-pull-msg.sh
index 8cccecc..9bc7821 100755
--- a/t/t5524-pull-msg.sh
+++ b/t/t5524-pull-msg.sh
@@ -16,7 +16,9 @@ test_expect_success setup '
test_tick &&
git commit -m "add bfile"
) &&
- test_tick && test_tick &&
+ test_tick &&
+ test_commit second afile &&
+ test_tick &&
echo "original $dollar" >afile &&
git add afile &&
git commit -m "do not clobber $dollar signs"
@@ -32,4 +34,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 result
+)
+'
+
test_done
--
2.1.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
