Merge branch 'sw/git-p4-unshelve-branched-files'

diff --git a/builtin/stash.c b/builtin/stash.c
index 8b82053f72db59d2217953ef2c811ba2be02b716..2a8e6d09b406345519201ef64f572197a409e7a4 100644 (file)
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -1280,7 +1280,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
                        ce_path_match(&the_index, active_cache[i], ps,
                                      ps_matched);
 
-               if (report_path_error(ps_matched, ps, NULL)) {
+               if (report_path_error(ps_matched, ps)) {
                        fprintf_ln(stderr, _("Did you forget to 'git add'?"));
                        ret = -1;
                        free(ps_matched);