From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Paul Tan <pyokagan@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>
Subject: [PATCH 2/2] pull: handle --log=<n>
Date: Wed, 13 May 2015 17:17:41 +0800 [thread overview]
Message-ID: <1431508661-21729-3-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1431508661-21729-1-git-send-email-pyokagan@gmail.com>
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.
This fixes the failing test '--log=1 limits shortlog length'.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
git-pull.sh | 4 ++--
t/t5524-pull-msg.sh | 2 +-
2 files changed, 3 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 593405d..64754b1 100755
--- a/t/t5524-pull-msg.sh
+++ b/t/t5524-pull-msg.sh
@@ -35,7 +35,7 @@ test_expect_success pull '
)
'
-test_expect_failure '--log=1 limits shortlog length' '
+test_expect_success '--log=1 limits shortlog length' '
(
cd cloned &&
git reset --hard HEAD^ &&
--
2.1.4
next prev parent reply other threads:[~2015-05-13 9:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-13 9:17 [PATCH 0/2] teach git pull to handle --log=<n> Paul Tan
2015-05-13 9:17 ` [PATCH 1/2] t5524: test --log=1 limits shortlog length Paul Tan
2015-05-13 9:17 ` Paul Tan [this message]
2015-05-13 9:38 ` [PATCH 2/2] pull: handle --log=<n> Matthieu Moy
2015-05-13 12:23 ` Johannes Schindelin
2015-05-13 20:03 ` Matthieu Moy
2015-05-13 9:40 ` [PATCH 0/2] teach git pull to " Matthieu Moy
2015-05-14 17:11 ` Junio C Hamano
2015-05-15 11:15 ` Paul Tan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431508661-21729-3-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).