aboutsummaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-30 12:10:29 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-30 12:10:33 -0700
commit4cebbe6f55269be0ce2fbc94457512a71c9c5262 (patch)
tree526efb294ec96e12f366e2c0f8367d713f643b43 /revision.c
parent414b7033b16f23b724ea81d71c4b74ef42edad17 (diff)
parentc8556c6213cf6dca63f29f98ad9d074f6c5f8233 (diff)
downloadgit-4cebbe6f55269be0ce2fbc94457512a71c9c5262.tar.gz
git-4cebbe6f55269be0ce2fbc94457512a71c9c5262.tar.xz
Merge branch 'nd/magic-pathspec'
All callers to parse_pathspec() must choose between getting no pathspec or one path that is limited to the current directory when there is no paths given on the command line, but there were two callers that violated this rule, triggering a BUG(). * nd/magic-pathspec: Fix calling parse_pathspec with no paths nor PATHSPEC_PREFER_* flags
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 7e03e154f..3fdea51ff 100644
--- 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;
}