From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Apr 2016 21:15:56 +0000 (-0700)
Subject: Merge branch 'sk/send-pack-all-fix' into maint
X-Git-Tag: v2.8.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/18c554b2720a869f1203a776cadd515fc6f3f840?ds=inline;hp=-c

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
---

18c554b2720a869f1203a776cadd515fc6f3f840
diff --combined builtin/send-pack.c
index 5b9dd6a9d8,19f0577fa0..1ff5a67538
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@@ -212,7 -212,7 +212,7 @@@ int cmd_send_pack(int argc, const char 
  				argv_array_push(&all_refspecs, buf);
  		} else {
  			struct strbuf line = STRBUF_INIT;
 -			while (strbuf_getline(&line, stdin, '\n') != EOF)
 +			while (strbuf_getline(&line, stdin) != EOF)
  				argv_array_push(&all_refspecs, line.buf);
  			strbuf_release(&line);
  		}
@@@ -225,7 -225,7 +225,7 @@@
  	 * --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);