From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Nov 2009 20:36:26 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.6-rc0~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8ac7a77be668180d515e234d550cc661aa0c1ebd;p=git.git

Merge branch 'maint'

* maint:
  merge: do not setup worktree twice
  check-ref-format: update usage string

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

8ac7a77be668180d515e234d550cc661aa0c1ebd
diff --cc builtin-check-ref-format.c
index e3e7bdf52,96382e344..513f13463
--- a/builtin-check-ref-format.c
+++ b/builtin-check-ref-format.c
@@@ -7,28 -7,10 +7,32 @@@
  #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 == 3 && !strcmp(argv[1], "--branch")) {
@@@ -39,16 -21,7 +43,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]);
  }