diff options
| author | Jeff King <peff@peff.net> | 2014-07-29 13:53:40 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-30 12:30:02 -0700 |
| commit | ae18165fbbf5e15ab2371d09f79cd12ee403c51e (patch) | |
| tree | 817ac31ccf7e423059f7ee6072b68598c2a14f1e /revision.c | |
| parent | 583b61c1af1bac12d6b48b2583ad508b5ab9964c (diff) | |
| download | git-ae18165fbbf5e15ab2371d09f79cd12ee403c51e.tar.gz | |
revision: drop useless string offset when parsing "--pretty"
Once upon a time, we parsed pretty options by looking for
"--pretty" at the start of the string, and then feeding the
rest (including an "=") to get_commit_format. Later, commit
48ded91 (log --pretty: do not accept bogus "--prettyshort",
2008-05-25) split this into a separate check for "--pretty"
versus "--pretty=".
However, when parsing "--pretty", we still passed "arg+8" to
get_commit_format. This is useless, since it will always
point to the NUL terminator at the end of the string. We can
simply pass NULL instead; both parameters are treated the
same by get_commit_format.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 2571ada6bf..615535c984 100644 --- a/revision.c +++ b/revision.c @@ -1825,7 +1825,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if (!strcmp(arg, "--pretty")) { revs->verbose_header = 1; revs->pretty_given = 1; - get_commit_format(arg+8, revs); + get_commit_format(NULL, revs); } else if (starts_with(arg, "--pretty=") || starts_with(arg, "--format=")) { /* * Detached form ("--pretty X" as opposed to "--pretty=X") |