X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=blobdiff_plain;f=rerere.c;h=ea24d4c2f47ab6495d97f38245dd420a1ad38391;hp=79203c6c1eae0db5515030b138e9e40e219af5f5;hb=bdfef0492cada3fb36f454804796bf12c79a7136;hpb=bd0f794342d5b3921f2d5d4bffce87ec7b7e4d96

diff --git a/rerere.c b/rerere.c
index 79203c6c1e..ea24d4c2f4 100644
--- a/rerere.c
+++ b/rerere.c
@@ -719,11 +719,9 @@ static void update_paths(struct string_list *update)
 			item->string);
 	}
 
-	if (active_cache_changed) {
-		if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK))
-			die("Unable to write new index file");
-	} else
-		rollback_lock_file(&index_lock);
+	if (write_locked_index(&the_index, &index_lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die("Unable to write new index file");
 }
 
 static void remove_variant(struct rerere_id *id)