diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-02 15:10:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 15:10:05 -0800 |
| commit | c40610422e1157e71dbc3c1a2f9e19bbe117962f (patch) | |
| tree | 251299eef1d983dfdcff8c6455e968234c6d0a56 /diff.c | |
| parent | Add git-blame, a tool for assigning blame. (diff) | |
| parent | Rip out merge-order and make "git log <paths>..." work again. (diff) | |
| download | git-c40610422e1157e71dbc3c1a2f9e19bbe117962f.tar.gz git-c40610422e1157e71dbc3c1a2f9e19bbe117962f.zip | |
Merge part of 'lt/rev-list' into 'fk/blame'
Now blame will depend on the new revision walker infrastructure,
we need to make it depend on earlier parts of Linus' rev-list
topic branch, hence this merge.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -311,7 +311,7 @@ static int work_tree_matches(const char *name, const unsigned char *sha1) ce = active_cache[pos]; if ((lstat(name, &st) < 0) || !S_ISREG(st.st_mode) || /* careful! */ - ce_match_stat(ce, &st) || + ce_match_stat(ce, &st, 0) || memcmp(sha1, ce->sha1, 20)) return 0; /* we return 1 only when we can stat, it is a regular file, |