From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 26 Jul 2010 04:52:29 +0000 (-0700)
Subject: Merge branch 'maint-1.6.5' into maint-1.6.6
X-Git-Tag: v1.6.6.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ad336054068074ed614d0bb54bb169e5263499d7?ds=inline;hp=-c

Merge branch 'maint-1.6.5' into maint-1.6.6

* maint-1.6.5:
request-pull.txt: Document -p option
Check size of path buffer before writing into it
rev-parse: fix --parse-opt --keep-dashdash --stop-at-non-option
---

ad336054068074ed614d0bb54bb169e5263499d7
diff --combined builtin-rev-parse.c
index 37d0233521,b58531209e..ee001250f5
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@@ -180,12 -180,6 +180,12 @@@ static int show_reference(const char *r
  	return 0;
  }
  
 +static int anti_reference(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 +{
 +	show_rev(REVERSED, sha1, refname);
 +	return 0;
 +}
 +
  static void show_datestring(const char *flag, const char *datestr)
  {
  	static char buffer[100];
@@@ -403,8 -397,8 +403,8 @@@ static int cmd_parseopt(int argc, cons
  	ALLOC_GROW(opts, onb + 1, osz);
  	memset(opts + onb, 0, sizeof(opts[onb]));
  	argc = parse_options(argc, argv, prefix, opts, usage,
- 			keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0 |
- 			stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0);
+ 			(keep_dashdash ? PARSE_OPT_KEEP_DASHDASH : 0) |
+ 			(stop_at_non_option ? PARSE_OPT_STOP_AT_NON_OPTION : 0));
  
  	strbuf_addf(&parsed, " --");
  	sq_quote_argv(&parsed, argv, 0);
@@@ -432,13 -426,6 +432,13 @@@ static void die_no_single_rev(int quiet
  		die("Needed a single revision");
  }
  
 +static const char builtin_rev_parse_usage[] =
 +"git rev-parse --parseopt [options] -- [<args>...]\n"
 +"   or: git rev-parse --sq-quote [<arg>...]\n"
 +"   or: git rev-parse [options] [<arg>...]\n"
 +"\n"
 +"Run \"git rev-parse --parseopt -h\" for more information on the first usage.";
 +
  int cmd_rev_parse(int argc, const char **argv, const char *prefix)
  {
  	int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
@@@ -451,9 -438,6 +451,9 @@@
  	if (argc > 1 && !strcmp("--sq-quote", argv[1]))
  		return cmd_sq_quote(argc - 2, argv + 2);
  
 +	if (argc > 1 && !strcmp("-h", argv[1]))
 +		usage(builtin_rev_parse_usage);
 +
  	prefix = setup_git_directory();
  	git_config(git_default_config, NULL);
  	for (i = 1; i < argc; i++) {
@@@ -564,11 -548,6 +564,11 @@@
  				for_each_ref(show_reference, NULL);
  				continue;
  			}
 +			if (!strcmp(arg, "--bisect")) {
 +				for_each_ref_in("refs/bisect/bad", show_reference, NULL);
 +				for_each_ref_in("refs/bisect/good", anti_reference, NULL);
 +				continue;
 +			}
  			if (!strcmp(arg, "--branches")) {
  				for_each_branch_ref(show_reference, NULL);
  				continue;
diff --combined setup.c
index 2cf0f19937,a614f125c3..2fa7969e82
--- a/setup.c
+++ b/setup.c
@@@ -64,19 -64,6 +64,19 @@@ const char *prefix_filename(const char 
  	return path;
  }
  
 +int check_filename(const char *prefix, const char *arg)
 +{
 +	const char *name;
 +	struct stat st;
 +
 +	name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
 +	if (!lstat(name, &st))
 +		return 1; /* file exists */
 +	if (errno == ENOENT || errno == ENOTDIR)
 +		return 0; /* file does not exist */
 +	die_errno("failed to stat '%s'", arg);
 +}
 +
  /*
   * Verify a filename that we got as an argument for a pathspec
   * entry. Note that a filename that begins with "-" never verifies
@@@ -86,12 -73,18 +86,12 @@@
   */
  void verify_filename(const char *prefix, const char *arg)
  {
 -	const char *name;
 -	struct stat st;
 -
  	if (*arg == '-')
  		die("bad flag '%s' used after filename", arg);
 -	name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
 -	if (!lstat(name, &st))
 +	if (check_filename(prefix, arg))
  		return;
 -	if (errno == ENOENT)
 -		die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 -		    "Use '--' to separate paths from revisions", arg);
 -	die_errno("failed to stat '%s'", arg);
 +	die("ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 +	    "Use '--' to separate paths from revisions", arg);
  }
  
  /*
@@@ -101,14 -94,19 +101,14 @@@
   */
  void verify_non_filename(const char *prefix, const char *arg)
  {
 -	const char *name;
 -	struct stat st;
 -
  	if (!is_inside_work_tree() || is_inside_git_dir())
  		return;
  	if (*arg == '-')
  		return; /* flag */
 -	name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg;
 -	if (!lstat(name, &st))
 -		die("ambiguous argument '%s': both revision and filename\n"
 -		    "Use '--' to separate filenames from revisions", arg);
 -	if (errno != ENOENT && errno != ENOTDIR)
 -		die_errno("failed to stat '%s'", arg);
 +	if (!check_filename(prefix, arg))
 +		return;
 +	die("ambiguous argument '%s': both revision and filename\n"
 +	    "Use '--' to separate filenames from revisions", arg);
  }
  
  const char **get_pathspec(const char *prefix, const char **pathspec)
@@@ -158,6 -156,8 +158,8 @@@ static int is_git_directory(const char 
  	char path[PATH_MAX];
  	size_t len = strlen(suspect);
  
+ 	if (PATH_MAX <= len + strlen("/objects"))
+ 		die("Too long path: %.*s", 60, suspect);
  	strcpy(path, suspect);
  	if (getenv(DB_ENVIRONMENT)) {
  		if (access(getenv(DB_ENVIRONMENT), X_OK))