From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Oct 2015 19:46:27 +0000 (-0700)
Subject: Sync with 2.6.1
X-Git-Tag: v2.7.0-rc0~129
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/590f6e4235a7d44ad39511186ca8bbac02ae8c2e?ds=inline;hp=--cc

Sync with 2.6.1
---

590f6e4235a7d44ad39511186ca8bbac02ae8c2e
diff --cc builtin/rerere.c
index 8c6cb6cdc6,88e1359ebc..1bf72423bf
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@@ -103,8 -104,9 +104,9 @@@ int cmd_rerere(int argc, const char **a
  			return 0;
  		for (i = 0; i < merge_rr.nr; i++) {
  			const char *path = merge_rr.items[i].string;
 -			const char *name = (const char *)merge_rr.items[i].util;
 -			if (diff_two(rerere_path(name, "preimage"), path, path, path))
 -				die("unable to generate diff for %s", name);
 +			const struct rerere_id *id = merge_rr.items[i].util;
- 			diff_two(rerere_path(id, "preimage"), path, path, path);
++			if (diff_two(rerere_path(id, "preimage"), path, path, path))
++				die("unable to generate diff for %s", rerere_path(id, NULL));
  		}
  	} else
  		usage_with_options(rerere_usage, options);
diff --cc connect.c
index acd39d70c8,27a706f766..ced4961398
--- a/connect.c
+++ b/connect.c
@@@ -727,9 -727,10 +730,10 @@@ struct child_process *git_connect(int f
  		conn->in = conn->out = -1;
  		if (protocol == PROTO_SSH) {
  			const char *ssh;
 -			int putty, tortoiseplink = 0;
 +			int putty = 0, tortoiseplink = 0;
  			char *ssh_host = hostandport;
  			const char *port = NULL;
+ 			transport_check_allowed("ssh");
  			get_host_and_port(&ssh_host, &port);
  
  			if (!port)
@@@ -785,6 -781,11 +789,8 @@@
  				argv_array_push(&conn->args, port);
  			}
  			argv_array_push(&conn->args, ssh_host);
+ 		} else {
 -			/* remove repo-local variables from the environment */
 -			conn->env = local_repo_env;
 -			conn->use_shell = 1;
+ 			transport_check_allowed("file");
  		}
  		argv_array_push(&conn->args, cmd.buf);