Merge commit '74359821' into js/reflog-delete

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 5df7961c501488a5393fd65de5de4bcf2eac1c25..84fbdd3af47c40879874d50b173ac633d279d734 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -738,6 +738,10 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->commit_format = CMIT_FMT_DEFAULT;
 
        diff_setup(&revs->diffopt);
+       if (prefix && !revs->diffopt.prefix) {
+               revs->diffopt.prefix = prefix;
+               revs->diffopt.prefix_length = strlen(prefix);
+       }
 }
 
 static void add_pending_commit_list(struct rev_info *revs,