summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-22 10:58:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-22 11:03:32 (GMT)
commit5c21ac0e7c475c82039ab604ee9d7d8430889346 (patch)
tree4dc25e01b3d8b9bf4eb46bab7c9632afd84c29fa /diff.h
parente09ad6e1e3308fde346b4b6287d9441363806832 (diff)
downloadgit-5c21ac0e7c475c82039ab604ee9d7d8430889346.zip
git-5c21ac0e7c475c82039ab604ee9d7d8430889346.tar.gz
git-5c21ac0e7c475c82039ab604ee9d7d8430889346.tar.bz2
Libified diff-index: backward compatibility fix.
"diff-index -m" does not mean "do not ignore merges", but means "pretend missing files match the index". The previous round tried to address this, but failed because setup_revisions() ate "-m" flag before the caller had a chance to intervene. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 837d449..7150b90 100644
--- a/diff.h
+++ b/diff.h
@@ -171,6 +171,6 @@ extern const char *diff_unique_abbrev(const unsigned char *, int);
extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
-extern int run_diff_index(struct rev_info *revs, int cached, int match_missing);
+extern int run_diff_index(struct rev_info *revs, int cached);
#endif /* DIFF_H */