From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 24 Sep 2017 10:39:42 +0000 (+0900)
Subject: Merge branch 'jk/revision-remove-cmdline-pathspec' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2adfb89370b533fea188f7e656de12e4c681cd97?hp=-c

Merge branch 'jk/revision-remove-cmdline-pathspec' into next

Code clean-up that also plugs memory leaks.

* jk/revision-remove-cmdline-pathspec:
pathspec doc: parse_pathspec does not maintain references to args
revision: replace "struct cmdline_pathspec" with argv_array
---

2adfb89370b533fea188f7e656de12e4c681cd97
diff --combined pathspec.c
index 1079362450,cdefdc7cc0..82eb39cd67
--- a/pathspec.c
+++ b/pathspec.c
@@@ -526,17 -526,13 +526,13 @@@ static void NORETURN unsupported_magic(
  	    pattern, sb.buf);
  }
  
- /*
-  * Given command line arguments and a prefix, convert the input to
-  * pathspec. die() if any magic in magic_mask is used.
-  */
  void parse_pathspec(struct pathspec *pathspec,
  		    unsigned magic_mask, unsigned flags,
  		    const char *prefix, const char **argv)
  {
  	struct pathspec_item *item;
  	const char *entry = argv ? *argv : NULL;
 -	int i, n, prefixlen, warn_empty_string, nr_exclude = 0;
 +	int i, n, prefixlen, nr_exclude = 0;
  
  	memset(pathspec, 0, sizeof(*pathspec));
  
@@@ -569,10 -565,13 +565,10 @@@
  	}
  
  	n = 0;
 -	warn_empty_string = 1;
  	while (argv[n]) {
 -		if (*argv[n] == '\0' && warn_empty_string) {
 -			warning(_("empty strings as pathspecs will be made invalid in upcoming releases. "
 -				  "please use . instead if you meant to match all paths"));
 -			warn_empty_string = 0;
 -		}
 +		if (*argv[n] == '\0')
 +			die("empty string is not a valid pathspec. "
 +				  "please use . instead if you meant to match all paths");
  		n++;
  	}