From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 21:04:59 +0000 (-0700)
Subject: Merge branch 'jk/clean-d-pathspec' into maint
X-Git-Tag: v1.9.1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9526473f110338d23524ea663eb282a36c7fe4f3?ds=inline;hp=-c

Merge branch 'jk/clean-d-pathspec' into maint

"git clean -d pathspec" did not use the given pathspec correctly
and ended up cleaning too much.

* jk/clean-d-pathspec:
clean: simplify dir/not-dir logic
clean: respect pathspecs with "-d"
---

9526473f110338d23524ea663eb282a36c7fe4f3
diff --combined builtin/clean.c
index cb02a5330a,4ec4fe2577..55029577f8
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@@ -100,7 -100,7 +100,7 @@@ static int parse_clean_color_slot(cons
  
  static int git_clean_config(const char *var, const char *value, void *cb)
  {
 -	if (!prefixcmp(var, "column."))
 +	if (starts_with(var, "column."))
  		return git_column_config(var, value, "clean", &colopts);
  
  	/* honors the color.interactive* config variables which also
@@@ -109,7 -109,7 +109,7 @@@
  		clean_use_color = git_config_colorbool(var, value);
  		return 0;
  	}
 -	if (!prefixcmp(var, "color.interactive.")) {
 +	if (starts_with(var, "color.interactive.")) {
  		int slot = parse_clean_color_slot(var +
  						  strlen("color.interactive."));
  		if (slot < 0)
@@@ -933,30 -933,46 +933,28 @@@ int cmd_clean(int argc, const char **ar
  
  	for (i = 0; i < dir.nr; i++) {
  		struct dir_entry *ent = dir.entries[i];
 -		int len, pos;
  		int matches = 0;
 -		const struct cache_entry *ce;
  		struct stat st;
  		const char *rel;
  
 -		/*
 -		 * Remove the '/' at the end that directory
 -		 * walking adds for directory entries.
 -		 */
 -		len = ent->len;
 -		if (len && ent->name[len-1] == '/')
 -			len--;
 -		pos = cache_name_pos(ent->name, len);
 -		if (0 <= pos)
 -			continue;	/* exact match */
 -		pos = -pos - 1;
 -		if (pos < active_nr) {
 -			ce = active_cache[pos];
 -			if (ce_namelen(ce) == len &&
 -			    !memcmp(ce->name, ent->name, len))
 -				continue; /* Yup, this one exists unmerged */
 -		}
 +		if (!cache_name_is_other(ent->name, ent->len))
 +			continue;
  
  		if (lstat(ent->name, &st))
  			die_errno("Cannot lstat '%s'", ent->name);
  
  		if (pathspec.nr)
 -			matches = match_pathspec_depth(&pathspec, ent->name,
 -						       len, 0, NULL);
 +			matches = dir_path_match(ent, &pathspec, 0, NULL);
  
- 		if (S_ISDIR(st.st_mode)) {
- 			if (remove_directories || (matches == MATCHED_EXACTLY)) {
- 				rel = relative_path(ent->name, prefix, &buf);
- 				string_list_append(&del_list, rel);
- 			}
- 		} else {
- 			if (pathspec.nr && !matches)
- 				continue;
- 			rel = relative_path(ent->name, prefix, &buf);
- 			string_list_append(&del_list, rel);
- 		}
+ 		if (pathspec.nr && !matches)
+ 			continue;
+ 
+ 		if (S_ISDIR(st.st_mode) && !remove_directories &&
+ 		    matches != MATCHED_EXACTLY)
+ 			continue;
+ 
+ 		rel = relative_path(ent->name, prefix, &buf);
+ 		string_list_append(&del_list, rel);
  	}
  
  	if (interactive && del_list.nr > 0)