[PATCH 1/6] shortlog: match both "Author:" and "author" on stdin
- From
Jeff King <peff@peff.net>
- Date
- Jan 18, 2016, 20:02 UTC
- Message-ID
- <20160118200240.GA15836@sigill.intra.peff.net>
- In-Reply-To
- <20160118200136.GA9514@sigill.intra.peff.net>
The original git-shortlog could read both the normal "git log" output as well as "git log --format=raw". However, when it was converted to C by b8ec592 (Build in shortlog, 2006-10-22), the trailing colon became mandatory, and we no longer matched the raw output.
Given the amount of intervening time without any bug reports, it's probable that nobody cares. But it's relatively easy to fix, and the end result is hopefully more readable than the original.
Note that this no longer matches "author: ", which we did before, but that has never been a format generated by git.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/shortlog.c | 7 ++++--- t/t4201-shortlog.sh | 6 ++++++ 2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 35ebd17..ab25b44 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -94,8 +94,9 @@ static void read_from_stdin(struct shortlog *log) char author[1024], oneline[1024]; while (fgets(author, sizeof(author), stdin) != NULL) { - if (!(author[0] == 'A' || author[0] == 'a') || - !starts_with(author + 1, "uthor: ")) + const char *v; + if (!skip_prefix(author, "Author: ", &v) && + !skip_prefix(author, "author ", &v)) continue; while (fgets(oneline, sizeof(oneline), stdin) && oneline[0] != '\n') @@ -103,7 +104,7 @@ static void read_from_stdin(struct shortlog *log) while (fgets(oneline, sizeof(oneline), stdin) && oneline[0] == '\n') ; /* discard blanks */ - insert_one_record(log, author + 8, oneline); + insert_one_record(log, v, oneline); } } diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index 7600a3e..82b2314 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -120,6 +120,12 @@ test_expect_success !MINGW 'shortlog from non-git directory' ' test_cmp expect out ' +test_expect_success !MINGW 'shortlog can read --format=raw output' ' + git log --format=raw HEAD >log && + GIT_DIR=non-existing git shortlog -w <log >out && + test_cmp expect out +' + test_expect_success 'shortlog should add newline when input line matches wraplen' ' cat >expect <<\EOF && A U Thor (2):
-- 2.7.0.248.g5eafd77