Merge branch 'nd/push-no-thin'
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:56:58 +0000 (14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Sep 2013 21:56:59 +0000 (14:56 -0700)
"git push --no-thin" was a no-op by mistake.

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

1  2 
builtin/push.c
builtin/receive-pack.c
diff --cc builtin/push.c
index 50bbfd62b135b6f4454c3cdd4e74cf227c24a1a5,333a1fb05939e9ee6bd313e7a2f77216c098fb0f..7b1b66c36ac14cb29db9dbbbd5b6f4d27b67d91c
@@@ -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,
Simple merge