From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:44 +0000 (-0700)
Subject: Merge branch 'bw/ls-files-recurse-submodules'
X-Git-Tag: v2.11.0-rc0~47
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c2b1f7018ba7d5f6a5d949e29e4eaeeef3261e2;p=thirdparty%2Fgit.git

Merge branch 'bw/ls-files-recurse-submodules'

"git ls-files" learned "--recurse-submodules" option that can be
used to get a listing of tracked files across submodules (i.e. this
only works with "--cached" option, not for listing untracked or
ignored files).  This would be a useful tool to sit on the upstream
side of a pipe that is read with xargs to work on all working tree
files from the top-level superproject.

* bw/ls-files-recurse-submodules:
  ls-files: add pathspec matching for submodules
  ls-files: pass through safe options for --recurse-submodules
  ls-files: optionally recurse into submodules
  git: make super-prefix option
---

1c2b1f7018ba7d5f6a5d949e29e4eaeeef3261e2
diff --cc builtin/ls-files.c
index 197f153f50,0f25914348..1592290815
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@@ -159,48 -233,53 +233,53 @@@ static void show_ce_entry(const char *t
  	if (len >= ce_namelen(ce))
  		die("git ls-files: internal error - cache entry not superset of prefix");
  
- 	if (!match_pathspec(&pathspec, ce->name, ce_namelen(ce),
- 			    len, ps_matched,
- 			    S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode)))
- 		return;
+ 	if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
+ 	    submodule_path_match(&pathspec, name.buf, ps_matched)) {
+ 		show_gitlink(ce);
+ 	} else if (match_pathspec(&pathspec, name.buf, name.len,
+ 				  len, ps_matched,
+ 				  S_ISDIR(ce->ce_mode) ||
+ 				  S_ISGITLINK(ce->ce_mode))) {
+ 		if (tag && *tag && show_valid_bit &&
+ 		    (ce->ce_flags & CE_VALID)) {
+ 			static char alttag[4];
+ 			memcpy(alttag, tag, 3);
+ 			if (isalpha(tag[0]))
+ 				alttag[0] = tolower(tag[0]);
+ 			else if (tag[0] == '?')
+ 				alttag[0] = '!';
+ 			else {
+ 				alttag[0] = 'v';
+ 				alttag[1] = tag[0];
+ 				alttag[2] = ' ';
+ 				alttag[3] = 0;
+ 			}
+ 			tag = alttag;
+ 		}
  
- 	if (tag && *tag && show_valid_bit &&
- 	    (ce->ce_flags & CE_VALID)) {
- 		static char alttag[4];
- 		memcpy(alttag, tag, 3);
- 		if (isalpha(tag[0]))
- 			alttag[0] = tolower(tag[0]);
- 		else if (tag[0] == '?')
- 			alttag[0] = '!';
- 		else {
- 			alttag[0] = 'v';
- 			alttag[1] = tag[0];
- 			alttag[2] = ' ';
- 			alttag[3] = 0;
+ 		if (!show_stage) {
+ 			fputs(tag, stdout);
+ 		} else {
+ 			printf("%s%06o %s %d\t",
+ 			       tag,
+ 			       ce->ce_mode,
 -			       find_unique_abbrev(ce->sha1,abbrev),
++			       find_unique_abbrev(ce->oid.hash, abbrev),
+ 			       ce_stage(ce));
+ 		}
+ 		write_eolinfo(ce, ce->name);
+ 		write_name(ce->name);
+ 		if (debug_mode) {
+ 			const struct stat_data *sd = &ce->ce_stat_data;
+ 
+ 			printf("  ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
+ 			printf("  mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
+ 			printf("  dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
+ 			printf("  uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
+ 			printf("  size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
  		}
- 		tag = alttag;
  	}
  
- 	if (!show_stage) {
- 		fputs(tag, stdout);
- 	} else {
- 		printf("%s%06o %s %d\t",
- 		       tag,
- 		       ce->ce_mode,
- 		       find_unique_abbrev(ce->oid.hash,abbrev),
- 		       ce_stage(ce));
- 	}
- 	write_eolinfo(ce, ce->name);
- 	write_name(ce->name);
- 	if (debug_mode) {
- 		const struct stat_data *sd = &ce->ce_stat_data;
- 
- 		printf("  ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
- 		printf("  mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
- 		printf("  dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
- 		printf("  uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
- 		printf("  size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
- 	}
+ 	strbuf_release(&name);
  }
  
  static void show_ru_info(void)