[PATCH 2/2] pull: handle --log=<n>
- From
Paul Tan <pyokagan@gmail.com>
- Date
- May 13, 2015, 09:17 UTC
- Message-ID
- <1431508661-21729-3-git-send-email-pyokagan@gmail.com>
- 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