merge-one-file: fix broken merges with alternate work trees

diff --git a/builtin-rev-list.c b/builtin-rev-list.c
index 1db4b4ccc628d43055c5604c73174a84788827f1..51ceb19d88918445c90eccc37f1fe5f90cedd385 100644 (file)
--- a/builtin-rev-list.c
+++ b/builtin-rev-list.c
@@ -316,7 +316,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
        git_config(git_default_config, NULL);
        init_revisions(&revs, prefix);
-       revs.abbrev = 0;
+       revs.abbrev = DEFAULT_ABBREV;
        revs.commit_format = CMIT_FMT_UNSPECIFIED;
        argc = setup_revisions(argc, argv, &revs, NULL);