Fix refresh-mode periodic not updating branch labels

This is a regression from #991. Bring back and improve correction from #591. Fixes #1270
jonas · Oct 21, 2023 · 7545d7b · 7545d7b
1 parent 447881b
commit 7545d7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/display.c b/src/display.c
@@ -771,13 +771,18 @@ get_input(int prompt_position, struct key *key)
 		int delay = -1;
 
 		if (opt_refresh_mode != REFRESH_MODE_MANUAL) {
+			bool refs_refreshed = false;
 
 			if (opt_refresh_mode == REFRESH_MODE_PERIODIC)
 				delay = watch_periodic(opt_refresh_interval);
 
 			foreach_displayed_view (view, i) {
 				if (view_can_refresh(view) &&
 					watch_dirty(&view->watch)) {
+					if (!refs_refreshed) {
+						load_refs(true);
+						refs_refreshed = true;
+					}
 					refresh_view(view);
 				}
 			}

diff --git a/src/watch.c b/src/watch.c
@@ -146,8 +146,14 @@ static enum watch_trigger
 watch_refs_handler(struct watch_handler *handler, enum watch_event event,
 		   enum watch_trigger check)
 {
-	if (event == WATCH_EVENT_AFTER_COMMAND)
-		load_refs(true);
+	if (event == WATCH_EVENT_AFTER_COMMAND ||
+	    check_file_mtime(&handler->last_modified, "%s/refs/heads", repo.git_dir) ||
+	    check_file_mtime(&handler->last_modified, "%s/refs/tags", repo.git_dir) ||
+	    check_file_mtime(&handler->last_modified, "%s/refs/notes", repo.git_dir) ||
+	    check_file_mtime(&handler->last_modified, "%s/packed-refs", repo.git_dir)) {
+		handler->last_modified = time(NULL);
+		return WATCH_REFS;
+	}
 
 	return WATCH_NONE;
 }