From: Junio C Hamano <junkio@cox.net>
Date: Wed, 15 Feb 2006 01:56:02 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v1.3.0-rc1~54^2~73
X-Git-Url: https://git.octo.it/?p=git.git;a=commitdiff_plain;h=becb6a658c43633850a2417935c108266056b765

Merge branch 'master'

* master:
  Merge branch 'kh/svn'
  git-svnimport: -r adds svn revision number to commit messages
  Merge branch 'jc/commit'
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.
  Merge branch 'jc/rebase'
  Merge branch 'ra/email'
---

becb6a658c43633850a2417935c108266056b765
diff --cc ls-files.c
index 5539fd85,a716e5fa..52bbfdc8
--- a/ls-files.c
+++ b/ls-files.c
@@@ -445,26 -454,9 +455,26 @@@ 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 (pathspec && !match(pathspec, ce->name, len))
+ 	if (pathspec && !match(pathspec, ps_matched, ce->name, len))
  		return;
  
 +	if (tag && *tag && show_valid_bit &&
 +	    (ce->ce_flags & htons(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 (!show_stage) {
  		fputs(tag, stdout);
  		write_name_quoted("", 0, ce->name + offset,