diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:46:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-21 00:46:07 -0800 |
| commit | 6ead3972f54e290b255b9c5379a2f9a35ec9f847 (patch) | |
| tree | 9035b08cb243740ca904985d42043e01775852f9 /commit-tree.c | |
| parent | 0f73e92ab78f1978da22746d3aacdd134b87d013 (diff) | |
| parent | e3b59a44f6705896db80965427a7cf9e2112634b (diff) | |
| download | git-6ead3972f54e290b255b9c5379a2f9a35ec9f847.tar.gz | |
Merge branch 'jc/ident'
* jc/ident:
Keep Porcelainish from failing by broken ident after making changes.
Delay "empty ident" errors until they really matter.
Make "empty ident" error message a bit more helpful.
Diffstat (limited to 'commit-tree.c')
| -rw-r--r-- | commit-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/commit-tree.c b/commit-tree.c index b1c8dca48d..88871b022d 100644 --- a/commit-tree.c +++ b/commit-tree.c @@ -118,8 +118,8 @@ int main(int argc, char **argv) add_buffer(&buffer, &size, "parent %s\n", sha1_to_hex(parent_sha1[i])); /* Person/date information */ - add_buffer(&buffer, &size, "author %s\n", git_author_info()); - add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info()); + add_buffer(&buffer, &size, "author %s\n", git_author_info(1)); + add_buffer(&buffer, &size, "committer %s\n\n", git_committer_info(1)); /* And add the comment */ while (fgets(comment, sizeof(comment), stdin) != NULL) |