Commit 0f2b3dca330fac55da7117609d772d5b55e74273
2018-12-22T12:57:39
show diffed commit IDs in 'got log -p' output
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/got/got.c b/got/got.c
index f60c8a4..621183d 100644
--- a/got/got.c
+++ b/got/got.c
@@ -303,6 +303,7 @@ print_patch(struct got_commit_object *commit, struct got_object_id *id,
const struct got_error *err = NULL;
struct got_tree_object *tree1 = NULL, *tree2;
struct got_object_qid *qid;
+ char *id_str1 = NULL, *id_str2;
err = got_object_open_as_tree(&tree2, repo, commit->tree_id);
if (err)
@@ -320,12 +321,24 @@ print_patch(struct got_commit_object *commit, struct got_object_id *id,
got_object_commit_close(pcommit);
if (err)
return err;
+
+ err = got_object_id_str(&id_str1, qid->id);
+ if (err)
+ return err;
}
+ err = got_object_id_str(&id_str2, id);
+ if (err)
+ goto done;
+
+ printf("diff: %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
err = got_diff_tree(tree1, tree2, "", "", diff_context, repo, stdout);
+done:
if (tree1)
got_object_tree_close(tree1);
got_object_tree_close(tree2);
+ free(id_str1);
+ free(id_str2);
return err;
}