commit - 7226d972852afba286a7e46e9f3854667e1a816f
commit + d7a045384f72c50b511b8aa8b7543c80f663c90e
blob - e7f70edda49950f35b7b6ed51b3b93cf368a3c81
blob + e4574cb41b8cda5c437d9fa3e44defbf1b55d20d
--- tog/tog.c
+++ tog/tog.c
@@ -2101,21 +2101,23 @@ static const struct got_error *
 set_selected_commit(struct tog_diff_view_state *s,
     struct commit_queue_entry *entry)
 {
-	struct commit_queue_entry *pentry;
+	const struct got_error *err;
+	const struct got_object_id_queue *parent_ids;
+	struct got_commit_object *selected_commit;
+	struct got_object_qid *pid;
 
 	free(s->id2);
 	s->id2 = got_object_id_dup(entry->id);
 	if (s->id2 == NULL)
 		return got_error_from_errno();
 
+	err = got_object_open_as_commit(&selected_commit, s->repo, entry->id);
+	if (err)
+		return err;
+	parent_ids = got_object_commit_get_parent_ids(selected_commit);
 	free(s->id1);
-	s->id1 = NULL;
-	pentry = TAILQ_NEXT(entry, entry);
-	if (pentry) {
-		s->id1 = got_object_id_dup(pentry->id);
-		if (s->id1 == NULL)
-			return got_error_from_errno();
-	}
+	pid = SIMPLEQ_FIRST(parent_ids);
+	s->id1 = pid ? got_object_id_dup(pid->id) : NULL;
 
 	return NULL;
 }