From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 May 2013 20:32:54 +0000 (-0700)
Subject: Sync with v1.8.2.3
X-Git-Tag: v1.8.3-rc2~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b387c77b12953d543bf5efc3825b5be26d753f9c?ds=inline;hp=-c

Sync with v1.8.2.3

* maint:
Git 1.8.2.3
t5004: avoid using tar for checking emptiness of archive
t5004: ignore pax global header file
mergetools/kdiff3: do not use --auto when diffing
transport-helper: trivial style cleanup
---

b387c77b12953d543bf5efc3825b5be26d753f9c
diff --combined transport-helper.c
index 835815f61d,fdd79d8b35..522d79178e
--- a/transport-helper.c
+++ b/transport-helper.c
@@@ -25,7 -25,6 +25,7 @@@ struct helper_data 
  		option : 1,
  		push : 1,
  		connect : 1,
 +		signed_tags : 1,
  		no_disconnect_req : 1;
  	char *export_marks;
  	char *import_marks;
@@@ -192,8 -191,6 +192,8 @@@ static struct child_process *get_helper
  			refspecs[refspec_nr++] = xstrdup(capname + strlen("refspec "));
  		} else if (!strcmp(capname, "connect")) {
  			data->connect = 1;
 +		} else if (!strcmp(capname, "signed-tags")) {
 +			data->signed_tags = 1;
  		} else if (!prefixcmp(capname, "export-marks ")) {
  			struct strbuf arg = STRBUF_INIT;
  			strbuf_addstr(&arg, "--export-marks=");
@@@ -214,9 -211,8 +214,8 @@@
  		int i;
  		data->refspec_nr = refspec_nr;
  		data->refspecs = parse_fetch_refspec(refspec_nr, refspecs);
- 		for (i = 0; i < refspec_nr; i++) {
+ 		for (i = 0; i < refspec_nr; i++)
  			free((char *)refspecs[i]);
- 		}
  		free(refspecs);
  	}
  	strbuf_release(&buf);
@@@ -413,11 -409,9 +412,11 @@@ static int get_exporter(struct transpor
  	/* we need to duplicate helper->in because we want to use it after
  	 * fastexport is done with it. */
  	fastexport->out = dup(helper->in);
 -	fastexport->argv = xcalloc(5 + revlist_args->nr, sizeof(*fastexport->argv));
 +	fastexport->argv = xcalloc(6 + revlist_args->nr, sizeof(*fastexport->argv));
  	fastexport->argv[argc++] = "fast-export";
  	fastexport->argv[argc++] = "--use-done-feature";
 +	fastexport->argv[argc++] = data->signed_tags ?
 +		"--signed-tags=verbatim" : "--signed-tags=warn-strip";
  	if (data->export_marks)
  		fastexport->argv[argc++] = data->export_marks;
  	if (data->import_marks)
@@@ -806,7 -800,6 +805,7 @@@ static int push_refs_with_export(struc
  		if (private && !get_sha1(private, sha1)) {
  			strbuf_addf(&buf, "^%s", private);
  			string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
 +			hashcpy(ref->old_sha1, sha1);
  		}
  		free(private);