diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 20:19:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 20:29:07 -0700 |
| commit | 48ded91674604c9756d53a7e657da0196795136f (patch) | |
| tree | ad68b98c2e441a63355d2b5368e7fb9fa6535852 /revision.c | |
| parent | 37869f40a817d4bf81f05cc62d9d39db7a3dc161 (diff) | |
| download | git-48ded91674604c9756d53a7e657da0196795136f.tar.gz git-48ded91674604c9756d53a7e657da0196795136f.tar.xz | |
log --pretty: do not accept bogus "--prettyshort"
... nor bogus "format.pretty = '=short'". Both are syntax errors.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/revision.c b/revision.c index ac057e1e6..fc6675525 100644 --- a/revision.c +++ b/revision.c @@ -1197,11 +1197,16 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch revs->verbose_header = 1; continue; } - if (!prefixcmp(arg, "--pretty")) { + if (!strcmp(arg, "--pretty")) { revs->verbose_header = 1; get_commit_format(arg+8, revs); continue; } + if (!prefixcmp(arg, "--pretty=")) { + revs->verbose_header = 1; + get_commit_format(arg+9, revs); + continue; + } if (!strcmp(arg, "--graph")) { revs->topo_order = 1; revs->rewrite_parents = 1; |