From 5c21ac0e7c475c82039ab604ee9d7d8430889346 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 22 Apr 2006 03:58:04 -0700 Subject: 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 --- diff-index.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'diff-index.c') diff --git a/diff-index.c b/diff-index.c index 4a243b3624..86940123b3 100644 --- a/diff-index.c +++ b/diff-index.c @@ -23,9 +23,7 @@ int main(int argc, const char **argv) for (i = 1; i < argc; i++) { const char *arg = argv[i]; - if (!strcmp(arg, "-m")) - match_missing = 1; - else if (!strcmp(arg, "--cached")) + if (!strcmp(arg, "--cached")) cached = 1; else usage(diff_cache_usage); @@ -37,5 +35,5 @@ int main(int argc, const char **argv) if (!rev.pending_objects || rev.pending_objects->next || rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1) usage(diff_cache_usage); - return run_diff_index(&rev, cached, match_missing); + return run_diff_index(&rev, cached); } -- cgit v1.2.3