checkout: allow dwim for branch creation for "git checkout $branch --"

diff --git a/combine-diff.c b/combine-diff.c
index 3e8bb17831aa5f2f39ee3a07eeebdda90ae39556..6dc06093d3c1eb6f3ab7a9cc79f0f192e16dc617 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1305,6 +1305,7 @@ void diff_tree_combined(const unsigned char *sha1,
        int i, num_paths, needsep, show_log_first, num_parent = parents->nr;
 
        diffopts = *opt;
+       diff_tree_setup_paths(diffopts.pathspec.raw, &diffopts);
        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
        DIFF_OPT_SET(&diffopts, RECURSIVE);
        DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL);
@@ -1375,6 +1376,8 @@ void diff_tree_combined(const unsigned char *sha1,
                paths = paths->next;
                free(tmp);
        }
+
+       diff_tree_release_paths(&diffopts);
 }
 
 void diff_tree_combined_merge(const struct commit *commit, int dense,