combine-diff: Honour -z option correctly.

diff --git a/config.c b/config.c
index 8355224bb16442d47c413aef3552b5d94c34b919..7dbdce1966b3c5e462e377b34ce8a11dd9668c0a 100644 (file)
--- a/config.c
+++ b/config.c
@@ -222,6 +222,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.ignorestat")) {
+               assume_unchanged = git_config_bool(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.symrefsonly")) {
                only_use_symrefs = git_config_bool(var, value);
                return 0;