Commit Diff


commit - dfc1d240864e4b31fed0d15b829dc86a45b808c5
commit + 06abe2cd35bd9a0a6696218ef52035866e7a6593
blob - d8bdfb1478a2cc082beeb058cb703b14a959463c
blob + aee813bd30238667da290ce630e93eabe3262168
--- tog/tog.c
+++ tog/tog.c
@@ -622,11 +622,11 @@ show_log_view(struct got_object_id *start_id, struct g
 			case 'j':
 			case KEY_DOWN:
 				nparents = num_parents(first_displayed_entry);
-				if (selected >= nparents - 1)
-					break;
-				if (selected < LINES - 1)
+				if (selected < LINES - 1 &&
+				    selected < nparents - 1)
 					selected++;
-				if (selected < LINES - 1)
+				if (selected < LINES - 1 &&
+				    selected < nparents - 1)
 					break;
 				err = scroll_down(&first_displayed_entry, 1,
 				    last_displayed_entry, &commits, repo);