summaryrefslogtreecommitdiff
path: root/builtin-add.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 14:15:40 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 14:15:40 -0800
commitc78a24986d4d3faff810e87dbcd0ac99f0eabbce (patch)
tree29ceb2cf66c2454949d42dae7d8a70cb8f87d70e /builtin-add.c
parentef4de8357dff57d403073572e8b260618bd03175 (diff)
parent25487bde2ab756a423489fc942b37c1550555b93 (diff)
downloadgit-c78a24986d4d3faff810e87dbcd0ac99f0eabbce.tar.gz
Merge branch 'jc/maint-add-sync-stat'
* jc/maint-add-sync-stat: t2200: test more cases of "add -u" git-add: make the entry stat-clean after re-adding the same contents ce_match_stat, run_diff_files: use symbolic constants for readability Conflicts: builtin-add.c
Diffstat (limited to 'builtin-add.c')
-rw-r--r--builtin-add.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c
index 45b14e8a61..77dcde6936 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -120,7 +120,7 @@ void add_files_to_cache(int verbose, const char *prefix, const char **files)
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = update_callback;
rev.diffopt.format_callback_data = &verbose;
- run_diff_files(&rev, 0);
+ run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
}
static void refresh(int verbose, const char **pathspec)