mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kn/reflog-symref-fix'

Browse Source 
reflog entries for symbolic ref updates were broken, which has been
corrected.

* kn/reflog-symref-fix:
  refs: fix creation of reflog entries for symrefs
This commit is contained in:
Junio C Hamano
2025-01-29 14:05:09 -08:00
parent 8d6240d4c6 3519492430
commit d205f06ae0
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
refs/files-backend.c
View File

@ -2615,9 +2615,6 @@ static int lock_ref_for_update(struct files_ref_store *refs,
update->backend_data = lock; update->backend_data = lock;
if (update->flags & REF_LOG_ONLY)
goto out;
if (update->type & REF_ISSYMREF) { if (update->type & REF_ISSYMREF) {
if (update->flags & REF_NO_DEREF) { if (update->flags & REF_NO_DEREF) {
/* /*

9
t/t1400-update-ref.sh
View File

@ -2068,4 +2068,13 @@ do
done done
test_expect_success 'update-ref should also create reflog for HEAD' '
test_commit to-rewind &&
git rev-parse HEAD >expect &&
head=$(git symbolic-ref HEAD) &&
git update-ref --create-reflog "$head" HEAD~ &&
git rev-parse HEAD@{1} >actual &&
test_cmp expect actual
'
test_done test_done