commit - dab5fe87a4baf0794fd02a8e5ad27561b107ea2a
commit + 0dcf3e9cb1566bfc029e55dfeff578ec16f48ef3
blob - 8349fe901e4e5ed535a8b09f924f0e8898d84015
blob + dc93773792aa9667b7dafd1a5e2848fe8ea478d7
--- got/got.c
+++ got/got.c
printf("-----------------------------------------------\n");
printf("commit %s\n", id_str);
free(id_str);
+ printf("from: %s\n", commit->author);
datestr = get_datestr(&committer_time, datebuf);
- printf("from: %s\n", commit->committer);
printf("date: %s UTC\n", datestr);
if (strcmp(commit->author, commit->committer) != 0)
- printf("original author: %s\n", commit->author);
+ printf("via: %s\n", commit->committer);
if (commit->nparents > 1) {
struct got_object_qid *qid;
int n = 1;
blob - a06d2b0cbf3abb882002f9c1f628fd88881f18e3
blob + 5355fad9d12d6460d05da51f01fa125cc0e99ff7
--- lib/diff.c
+++ lib/diff.c
goto done;
}
free(id_str);
- time = mktime(&commit2->tm_author);
if (fprintf(outfile, "from: %s\n", commit2->author) < 0) {
err = got_error_from_errno();
goto done;
}
+ time = mktime(&commit2->tm_committer);
if (fprintf(outfile, "date: %s UTC\n",
get_datestr(&time, datebuf)) < 0) {
err = got_error_from_errno();
goto done;
}
- time = mktime(&commit2->tm_committer);
if (strcmp(commit2->author, commit2->committer) != 0 &&
- fprintf(outfile, "original author: %s\n", commit2->committer) < 0) {
+ fprintf(outfile, "via: %s\n", commit2->committer) < 0) {
err = got_error_from_errno();
goto done;
}