diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-29 21:15:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 21:15:57 (GMT) |
| commit | 18c554b2720a869f1203a776cadd515fc6f3f840 (patch) | |
| tree | 3015c48e406d980c401433fee20ba839b0166624 /builtin | |
| parent | b96c396cce05c9559f335d5ed6856687036e01ba (diff) | |
| parent | c6777563cd2b3e1d1989732c3daf05a72fddb068 (diff) | |
| download | git-18c554b2720a869f1203a776cadd515fc6f3f840.zip git-18c554b2720a869f1203a776cadd515fc6f3f840.tar.gz git-18c554b2720a869f1203a776cadd515fc6f3f840.tar.bz2 | |
Merge branch 'sk/send-pack-all-fix' into maint
"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')
| -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 5b9dd6a..1ff5a67 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); |