From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Nov 2009 19:10:14 +0000 (-0800)
Subject: Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere
X-Git-Tag: v1.6.6-rc0~34^2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1a507b9cf75bcb2de2391c584539e0ff202549bf?ds=inline;hp=-c

Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere

* jn/maint-http-fetch-mingw:
http-fetch: add missing initialization of argv0_path
merge: do not setup worktree twice
check-ref-format: update usage string

Conflicts:
builtin-check-ref-format.c
---

1a507b9cf75bcb2de2391c584539e0ff202549bf
diff --combined builtin-check-ref-format.c
index 0a576afd0e,96382e3447..b106c65d80
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@@ -7,33 -7,12 +7,37 @@@
  #include "builtin.h"
  #include "strbuf.h"
  
+ static const char builtin_check_ref_format_usage[] =
+ "git check-ref-format [--print] <refname>\n"
+ "   or: git check-ref-format --branch <branchname-shorthand>";
+ 
 +/*
 + * Replace each run of adjacent slashes in src with a single slash,
 + * and write the result to dst.
 + *
 + * This function is similar to normalize_path_copy(), but stripped down
 + * to meet check_ref_format's simpler needs.
 + */
 +static void collapse_slashes(char *dst, const char *src)
 +{
 +	char ch;
 +	char prev = '\0';
 +
 +	while ((ch = *src++) != '\0') {
 +		if (prev == '/' && ch == prev)
 +			continue;
 +
 +		*dst++ = ch;
 +		prev = ch;
 +	}
 +	*dst = '\0';
 +}
 +
  int cmd_check_ref_format(int argc, const char **argv, const char *prefix)
  {
 +	if (argc == 2 && !strcmp(argv[1], "-h"))
 +		usage(builtin_check_ref_format_usage);
 +
  	if (argc == 3 && !strcmp(argv[1], "--branch")) {
  		struct strbuf sb = STRBUF_INIT;
  
@@@ -42,16 -21,7 +46,16 @@@
  		printf("%s\n", sb.buf + 11);
  		exit(0);
  	}
 +	if (argc == 3 && !strcmp(argv[1], "--print")) {
 +		char *refname = xmalloc(strlen(argv[2]) + 1);
 +
 +		if (check_ref_format(argv[2]))
 +			exit(1);
 +		collapse_slashes(refname, argv[2]);
 +		printf("%s\n", refname);
 +		exit(0);
 +	}
  	if (argc != 2)
- 		usage("git check-ref-format refname");
+ 		usage(builtin_check_ref_format_usage);
  	return !!check_ref_format(argv[1]);
  }
diff --combined builtin-merge.c
index c69a3051f3,e95c5dc717..18571387f1
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@@ -264,7 -264,6 +264,7 @@@ static void squash_message(void
  	struct strbuf out = STRBUF_INIT;
  	struct commit_list *j;
  	int fd;
 +	struct pretty_print_context ctx = {0};
  
  	printf("Squash commit -- not updating HEAD\n");
  	fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666);
@@@ -286,15 -285,13 +286,15 @@@
  	if (prepare_revision_walk(&rev))
  		die("revision walk setup failed");
  
 +	ctx.abbrev = rev.abbrev;
 +	ctx.date_mode = rev.date_mode;
 +
  	strbuf_addstr(&out, "Squashed commit of the following:\n");
  	while ((commit = get_revision(&rev)) != NULL) {
  		strbuf_addch(&out, '\n');
  		strbuf_addf(&out, "commit %s\n",
  			sha1_to_hex(commit->object.sha1));
 -		pretty_print_commit(rev.commit_format, commit, &out, rev.abbrev,
 -			NULL, NULL, rev.date_mode, 0);
 +		pretty_print_commit(rev.commit_format, commit, &out, &ctx);
  	}
  	if (write(fd, out.buf, out.len) < 0)
  		die_errno("Writing SQUASH_MSG");
@@@ -843,7 -840,6 +843,6 @@@ int cmd_merge(int argc, const char **ar
  	const char *best_strategy = NULL, *wt_strategy = NULL;
  	struct commit_list **remotes = &remoteheads;
  
- 	setup_work_tree();
  	if (file_exists(git_path("MERGE_HEAD")))
  		die("You have not concluded your merge. (MERGE_HEAD exists)");
  	if (read_cache_unmerged())