diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-30 12:10:33 -0700 |
| commit | 4cebbe6f55269be0ce2fbc94457512a71c9c5262 (patch) | |
| tree | 526efb294ec96e12f366e2c0f8367d713f643b43 /line-log.c | |
| parent | 414b7033b16f23b724ea81d71c4b74ef42edad17 (diff) | |
| parent | c8556c6213cf6dca63f29f98ad9d074f6c5f8233 (diff) | |
| download | git-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 'line-log.c')
| -rw-r--r-- | line-log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/line-log.c b/line-log.c index 8b6e497b3..717638b33 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); } } |