Skip to content

Commit 7c2f505

Browse files
committed
refs: update HEAD when moving its underlying ref
1 parent 7df254e commit 7c2f505

1 file changed

Lines changed: 24 additions & 1 deletion

File tree

‎src/refdb_fs.c‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1430,10 +1430,12 @@ static int refdb_fs_backend__rename(
14301430
const char *message)
14311431
{
14321432
refdb_fs_backend *backend = (refdb_fs_backend *)_backend;
1433-
git_reference *old, *new = NULL;
1433+
git_reference *old, *new = NULL, *head = NULL;
14341434
git_filebuf old_lock = GIT_FILEBUF_INIT;
14351435
git_filebuf new_lock = GIT_FILEBUF_INIT;
14361436
int error;
1437+
int is_head = 0;
1438+
char *old_head_target = NULL;
14371439
git__refdb_flags flags;
14381440

14391441
assert(backend);
@@ -1442,6 +1444,14 @@ static int refdb_fs_backend__rename(
14421444
(error = refdb_fs_backend__lookup(&old, _backend, old_name)) < 0)
14431445
return error;
14441446

1447+
if ((error = refdb_fs_backend__lookup(&head, _backend, GIT_HEAD_FILE)) < 0)
1448+
goto cleanup;
1449+
1450+
if (head->type == GIT_REF_SYMBOLIC && strcmp(head->target.symbolic, old->name) == 0) {
1451+
is_head = 1;
1452+
old_head_target = head->target.symbolic;
1453+
}
1454+
14451455
/* We delete the old ref first so we don't cause a failure later if the new
14461456
* name is the suffix or prefix of the old. Also, we skip the reflog, because
14471457
* we want to rename it */
@@ -1479,12 +1489,25 @@ static int refdb_fs_backend__rename(
14791489
if ((error = loose_commit(&new_lock, new)) < 0)
14801490
goto cleanup;
14811491

1492+
/* We're done renaming refs, but we might have to update HEAD */
1493+
if (is_head) {
1494+
git_filebuf head_lock = GIT_FILEBUF_INIT;
1495+
head->target.symbolic = git__strdup(new_name);
1496+
if ((error = refdb_fs_backend__write_tail(&head_lock, _backend, head,
1497+
NULL, old_head_target, GIT_REFDB__FORCE_WRITE, who, message)) < 0) {
1498+
goto cleanup;
1499+
}
1500+
if ((error = loose_commit(&head_lock, head)) < 0)
1501+
goto cleanup;
1502+
}
14821503

14831504
goto success;
14841505

14851506
cleanup:
1507+
git__free(old_head_target);
14861508
git_filebuf_cleanup(&new_lock);
14871509
git_reference_free(new);
1510+
git_reference_free(head);
14881511
git_reference_free(old);
14891512
new = NULL;
14901513

0 commit comments

Comments
 (0)