diff --relative: help working in a bare repository

diff --git a/revision.c b/revision.c
index 6d9188b6cb0c8eb27de89be21d48b0f2b7dd42c0..4d6f57b64e077b3e3853a199daad7511b5ab2f4c 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -720,7 +720,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
        revs->commit_format = CMIT_FMT_DEFAULT;
 
        diff_setup(&revs->diffopt);
-       if (prefix) {
+       if (prefix && !revs->diffopt.prefix) {
                revs->diffopt.prefix = prefix;
                revs->diffopt.prefix_length = strlen(prefix);
        }