refs: updating HEAD is done by the refdb now

tiennou · tiennou · commit e5cd23892468 · 2018-05-08T12:56:07.000+02:00
diff --git a/src/refs.c b/src/refs.c
@@ -677,8 +677,8 @@ static int reference__rename(git_reference **out, git_reference *ref, const char
 {
 	git_repository *repo;
 	git_refname_t normalized;
-	bool should_head_be_updated = false;
 	int error = 0;
+	rename_cb_data payload;
 
 	assert(ref && new_name && signature);
 
@@ -688,27 +688,13 @@ static int reference__rename(git_reference **out, git_reference *ref, const char
 		normalized, repo, new_name, true)) < 0)
 		return error;
 
-	/* Check if we have to update HEAD. */
-	if ((error = git_branch_is_head(ref)) < 0)
-		return error;
-
-	should_head_be_updated = (error > 0);
-
 	if ((error = git_refdb_rename(out, ref->db, ref->name, normalized, force, signature, message)) < 0)
 		return error;
 
-	/* Update HEAD if it was pointing to the reference being renamed */
-	if (should_head_be_updated) {
-		error = git_repository_set_head(ref->db->repo, normalized);
-	} else {
-		rename_cb_data payload;
-		payload.old_name = ref->name;
-		memcpy(&payload.new_name, &normalized, sizeof(normalized));
+	payload.old_name = ref->name;
+	memcpy(&payload.new_name, &normalized, sizeof(normalized));
 
-		error = git_repository_foreach_head(repo, update_wt_heads, &payload);
-	}
-
-	return error;
+	return git_repository_foreach_head(repo, update_wt_heads, &payload);
 }
 
 
