Git 1.8.5-rc0

diff --git a/revision.c b/revision.c
index 7e03e154f446d2c105150cecea8c50fdc8e5238a..3fdea51ffed4839c6c30f34b45d67f5e95ab6cc2 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1372,7 +1372,8 @@ static void prepare_show_merge(struct rev_info *revs)
                        i++;
        }
        free_pathspec(&revs->prune_data);
-       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC, 0, "", prune);
+       parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC,
+                      PATHSPEC_PREFER_FULL, "", prune);
        revs->limited = 1;
 }