diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 23:10:29 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 23:10:33 +0400 |
| commit | 4cebbe6f55269be0ce2fbc94457512a71c9c5262 (patch) | |
| tree | 526efb294ec96e12f366e2c0f8367d713f643b43 | |
| parent | 414b7033b16f23b724ea81d71c4b74ef42edad17 (diff) | |
| parent | c8556c6213cf6dca63f29f98ad9d074f6c5f8233 (diff) | |
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
| -rw-r--r-- | line-log.c | 3 | ||||
| -rw-r--r-- | revision.c | 3 | ||||
| -rwxr-xr-x | t/t4208-log-magic-pathspec.sh | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/line-log.c b/line-log.c index 8b6e497b3f..717638b333 100644 --- a/line-log.c +++ b/line-log.c @@ -760,7 +760,8 @@ void line_log_init(struct rev_info *rev, const char *prefix, struct string_list r = r->next; } paths[count] = NULL; - parse_pathspec(&rev->diffopt.pathspec, 0, 0, "", paths); + parse_pathspec(&rev->diffopt.pathspec, 0, + PATHSPEC_PREFER_FULL, "", paths); free(paths); } } diff --git a/revision.c b/revision.c index 7e03e154f4..3fdea51ffe 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; } diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh index 72300b5f24..d8f23f488e 100755 --- a/t/t4208-log-magic-pathspec.sh +++ b/t/t4208-log-magic-pathspec.sh @@ -46,4 +46,19 @@ test_expect_success 'git log HEAD -- :/' ' test_cmp expected actual ' +test_expect_success 'command line pathspec parsing for "git log"' ' + git reset --hard && + >a && + git add a && + git commit -m "add an empty a" --allow-empty && + echo 1 >a && + git commit -a -m "update a to 1" && + git checkout HEAD^ && + echo 2 >a && + git commit -a -m "update a to 2" && + test_must_fail git merge master && + git add a && + git log --merge -- a +' + test_done |