diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-05-18 21:39:56 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-18 11:19:36 -0700 |
| commit | 5061a44bcc7bfab0764b3854b8b2df69a93675ad (patch) | |
| tree | acf2b22a7ceddad7345b2e2aeec2df4b1354b0f1 /t/t9126-git-svn-follow-deleted-readded-directory.sh | |
| parent | 9a3d637541a5b6fcd84b6f5fa057e597d1696460 (diff) | |
| download | git-pt/pull-log-n.tar.gz | |
pull: handle --log=<n>pt/pull-log-n
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 <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9126-git-svn-follow-deleted-readded-directory.sh')
0 files changed, 0 insertions, 0 deletions