Commit d82ad331dd0534d30ff4b9f4b180949377be04c1
2018-05-09T20:53:57
add get_head_commit_id() helper function to tog
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 38 39 40 41 42 43 44 45 46 47
diff --git a/tog/tog.c b/tog/tog.c
index 05264b3..30c2779 100644
--- a/tog/tog.c
+++ b/tog/tog.c
@@ -347,6 +347,28 @@ draw_commits(struct commit_queue *commits, int selected)
}
static const struct got_error *
+get_head_commit_id(struct got_object_id **head_id, struct got_repository *repo)
+{
+ const struct got_error *err = NULL;
+ struct got_reference *head_ref;
+
+ *head_id = NULL;
+
+ err = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
+ if (err)
+ return err;
+
+ err = got_ref_resolve(head_id, repo, head_ref);
+ got_ref_close(head_ref);
+ if (err) {
+ *head_id = NULL;
+ return err;
+ }
+
+ return NULL;
+}
+
+static const struct got_error *
show_log_view(struct got_object_id *start_id, struct got_repository *repo)
{
const struct got_error *err = NULL;
@@ -511,12 +533,7 @@ cmd_log(int argc, char *argv[])
return error;
if (start_commit == NULL) {
- struct got_reference *head_ref;
- error = got_ref_open(&head_ref, repo, GOT_REF_HEAD);
- if (error != NULL)
- return error;
- error = got_ref_resolve(&id, repo, head_ref);
- got_ref_close(head_ref);
+ error = get_head_commit_id(&id, repo);
if (error != NULL)
return error;
} else {