Skip to content

Commit d205f06

Browse files
committed
Merge branch 'kn/reflog-symref-fix'
reflog entries for symbolic ref updates were broken, which has been corrected. * kn/reflog-symref-fix: refs: fix creation of reflog entries for symrefs
2 parents 8d6240d + 3519492 commit d205f06

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

refs/files-backend.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2615,9 +2615,6 @@ static int lock_ref_for_update(struct files_ref_store *refs,
26152615

26162616
update->backend_data = lock;
26172617

2618-
if (update->flags & REF_LOG_ONLY)
2619-
goto out;
2620-
26212618
if (update->type & REF_ISSYMREF) {
26222619
if (update->flags & REF_NO_DEREF) {
26232620
/*

t/t1400-update-ref.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,4 +2068,13 @@ do
20682068

20692069
done
20702070

2071+
test_expect_success 'update-ref should also create reflog for HEAD' '
2072+
test_commit to-rewind &&
2073+
git rev-parse HEAD >expect &&
2074+
head=$(git symbolic-ref HEAD) &&
2075+
git update-ref --create-reflog "$head" HEAD~ &&
2076+
git rev-parse HEAD@{1} >actual &&
2077+
test_cmp expect actual
2078+
'
2079+
20712080
test_done

0 commit comments

Comments
 (0)