summaryrefslogtreecommitdiff
path: root/apply.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-22 06:33:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-22 06:33:21 (GMT)
commitee072260dbff6914c24d956bcc2d46882831f1a0 (patch)
tree903879eab78ae085ccb956299d6d8007e4427cee /apply.c
parent712b1dd389ad5bcdbaab0279641f0970702fc1f1 (diff)
parent7b80be150ce137a790f498a69a784d61d8fc2e78 (diff)
downloadgit-ee072260dbff6914c24d956bcc2d46882831f1a0.zip
git-ee072260dbff6914c24d956bcc2d46882831f1a0.tar.gz
git-ee072260dbff6914c24d956bcc2d46882831f1a0.tar.bz2
Merge branch 'jc/nostat'
* jc/nostat: cache_name_compare() compares name and stage, nothing else. "assume unchanged" git: documentation. ls-files: split "show-valid-bit" into a different option. "Assume unchanged" git: --really-refresh fix. ls-files: debugging aid for CE_VALID changes. "Assume unchanged" git: do not set CE_VALID with --refresh "Assume unchanged" git
Diffstat (limited to 'apply.c')
-rw-r--r--apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apply.c b/apply.c
index 1083d4f..244718c 100644
--- a/apply.c
+++ b/apply.c
@@ -1317,7 +1317,7 @@ static int check_patch(struct patch *patch)
return -1;
}
- changed = ce_match_stat(active_cache[pos], &st);
+ changed = ce_match_stat(active_cache[pos], &st, 1);
if (changed)
return error("%s: does not match index",
old_name);