From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Sep 2013 21:56:58 +0000 (-0700)
Subject: Merge branch 'nd/push-no-thin'
X-Git-Tag: v1.8.5-rc0~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2de0f39cd27d8ab8eae2e3430b81294f26252693;p=thirdparty%2Fgit.git

Merge branch 'nd/push-no-thin'

"git push --no-thin" was a no-op by mistake.

* nd/push-no-thin:
  push: respect --no-thin
---

2de0f39cd27d8ab8eae2e3430b81294f26252693
diff --cc builtin/push.c
index 50bbfd62b1,333a1fb059..7b1b66c36a
--- a/builtin/push.c
+++ b/builtin/push.c
@@@ -315,16 -313,8 +315,15 @@@ static int push_with_options(struct tra
  	if (receivepack)
  		transport_set_option(transport,
  				     TRANS_OPT_RECEIVEPACK, receivepack);
- 	if (thin)
- 		transport_set_option(transport, TRANS_OPT_THIN, "yes");
+ 	transport_set_option(transport, TRANS_OPT_THIN, thin ? "yes" : NULL);
  
 +	if (!is_empty_cas(&cas)) {
 +		if (!transport->smart_options)
 +			die("underlying transport does not support --%s option",
 +			    CAS_OPT_NAME);
 +		transport->smart_options->cas = &cas;
 +	}
 +
  	if (verbosity > 0)
  		fprintf(stderr, _("Pushing to %s\n"), transport->url);
  	err = transport_push(transport, refspec_nr, refspec, flags,