diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:33 -0700 |
| commit | 5250af49f03b5f2da96770523f69d7584693b553 (patch) | |
| tree | c689fbedf534338c89631969546c230b4fbc51cf /builtin/send-pack.c | |
| parent | Merge branch 'sg/diff-multiple-identical-renames' (diff) | |
| parent | git-send-pack: fix --all option when used with directory (diff) | |
| download | tgif-5250af49f03b5f2da96770523f69d7584693b553.tar.xz | |
Merge branch 'sk/send-pack-all-fix'
"git send-pack --all <there>" was broken when its command line
option parsing was written in the 2.6 timeframe.
* sk/send-pack-all-fix:
git-send-pack: fix --all option when used with directory
Diffstat (limited to 'builtin/send-pack.c')
| -rw-r--r-- | builtin/send-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c index 5b9dd6a9d8..1ff5a67538 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -225,7 +225,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) * --all and --mirror are incompatible; neither makes sense * with any refspecs. */ - if ((refspecs && (send_all || args.send_mirror)) || + if ((nr_refspecs > 0 && (send_all || args.send_mirror)) || (send_all && args.send_mirror)) usage_with_options(send_pack_usage, options); |