From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Feb 2015 23:40:14 +0000 (-0800)
Subject: Merge branch 'dp/remove-duplicated-header-inclusion'
X-Git-Tag: v2.4.0-rc0~88
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a75c663cd2056919a58ea949c519aad90eddd2f5?ds=inline;hp=-c

Merge branch 'dp/remove-duplicated-header-inclusion'

Code clean-up.

* dp/remove-duplicated-header-inclusion:
do not include the same header twice
---

a75c663cd2056919a58ea949c519aad90eddd2f5
diff --combined transport-helper.c
index 7441d5d515,3652b164c3..7dc4a443ae
--- a/transport-helper.c
+++ b/transport-helper.c
@@@ -5,7 -5,6 +5,6 @@@
  #include "commit.h"
  #include "diff.h"
  #include "revision.h"
- #include "quote.h"
  #include "remote.h"
  #include "string-list.h"
  #include "thread-utils.h"
@@@ -356,8 -355,7 +355,8 @@@ static int fetch_with_fetch(struct tran
  			continue;
  
  		strbuf_addf(&buf, "fetch %s %s\n",
 -			    sha1_to_hex(posn->old_sha1), posn->name);
 +			    sha1_to_hex(posn->old_sha1),
 +			    posn->symref ? posn->symref : posn->name);
  	}
  
  	strbuf_addch(&buf, '\n');
@@@ -455,8 -453,7 +454,8 @@@ static int fetch_with_import(struct tra
  		if (posn->status & REF_STATUS_UPTODATE)
  			continue;
  
 -		strbuf_addf(&buf, "import %s\n", posn->name);
 +		strbuf_addf(&buf, "import %s\n",
 +			    posn->symref ? posn->symref : posn->name);
  		sendline(data, &buf);
  		strbuf_reset(&buf);
  	}
@@@ -489,15 -486,14 +488,15 @@@
  	 * fast-forward or this is a forced update.
  	 */
  	for (i = 0; i < nr_heads; i++) {
 -		char *private;
 +		char *private, *name;
  		posn = to_fetch[i];
  		if (posn->status & REF_STATUS_UPTODATE)
  			continue;
 +		name = posn->symref ? posn->symref : posn->name;
  		if (data->refspecs)
 -			private = apply_refspecs(data->refspecs, data->refspec_nr, posn->name);
 +			private = apply_refspecs(data->refspecs, data->refspec_nr, name);
  		else
 -			private = xstrdup(posn->name);
 +			private = xstrdup(name);
  		if (private) {
  			read_ref(private, posn->old_sha1);
  			free(private);
@@@ -863,7 -859,7 +862,7 @@@ static int push_refs_with_export(struc
  			die("helper %s does not support dry-run", data->name);
  	} else if (flags & TRANSPORT_PUSH_CERT) {
  		if (set_helper_option(transport, TRANS_OPT_PUSH_CERT, "true") != 0)
 -			die("helper %s does not support dry-run", data->name);
 +			die("helper %s does not support --signed", data->name);
  	}
  
  	if (flags & TRANSPORT_PUSH_FORCE) {