diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 13:19:30 +0900 |
commit | d8ce144e11fef0606a531a5a9c34c2a8ca09e155 (patch) | |
tree | 92a8566d6fc7eabd26057b1ad6ae355098b9060f /builtin/am.c | |
parent | Merge branch 'sg/git-test-boolean' (diff) | |
parent | pack-objects: drop packlist index_pos optimization (diff) | |
download | tgif-d8ce144e11fef0606a531a5a9c34c2a8ca09e155.tar.xz |
Merge branch 'jk/misc-uninitialized-fixes'
Various fixes to codepaths gcc 9 had trouble following dataflow.
* jk/misc-uninitialized-fixes:
pack-objects: drop packlist index_pos optimization
test-read-cache: drop namelen variable
diff-delta: set size out-parameter to 0 for NULL delta
bulk-checkin: zero-initialize hashfile_checkpoint
pack-objects: use object_id in packlist_alloc()
git-am: handle missing "author" when parsing commit
Diffstat (limited to 'builtin/am.c')
-rw-r--r-- | builtin/am.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/am.c b/builtin/am.c index 1aea657a7f..ee7305eaa6 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -1272,7 +1272,9 @@ static void get_commit_info(struct am_state *state, struct commit *commit) buffer = logmsg_reencode(commit, NULL, get_commit_output_encoding()); ident_line = find_commit_header(buffer, "author", &ident_len); - + if (!ident_line) + die(_("missing author line in commit %s"), + oid_to_hex(&commit->object.oid)); if (split_ident_line(&id, ident_line, ident_len) < 0) die(_("invalid ident line: %.*s"), (int)ident_len, ident_line); |