@@ -825,8 +825,8 @@ static int refdb_fs_backend__write_tail(git_filebuf *out_lock, git_refdb_backend
825825 git__refdb_flags flags , const git_signature * who , const char * message );
826826
827827static int refdb_fs_backend__delete_tail (git_filebuf * out_lock , git_refdb_backend * _backend ,
828- const char * ref_name , const git_oid * old_id , const char * old_target ,
829- git__refdb_flags flags );
828+ const git_reference * ref , const git_oid * old_id , const char * old_target ,
829+ git__refdb_flags flags , const git_signature * who , const char * message );
830830
831831static int refdb_fs_backend__unlock (git_refdb_backend * backend , void * payload , int success , int update_reflog ,
832832 const git_reference * ref , const git_signature * sig , const char * message )
@@ -839,7 +839,7 @@ static int refdb_fs_backend__unlock(git_refdb_backend *backend, void *payload, i
839839 flags |= GIT_REFDB__SKIP_REFLOG ;
840840 }
841841 if (success == 2 ) {
842- error = refdb_fs_backend__delete_tail (lock , backend , ref -> name , NULL , NULL , flags );
842+ error = refdb_fs_backend__delete_tail (lock , backend , ref , NULL , NULL , flags , sig , message );
843843 } else if (success ) {
844844 error = refdb_fs_backend__write_tail (lock , backend , ref , NULL , NULL , flags , sig , message );
845845 if (error == 0 ) {
@@ -1317,12 +1317,18 @@ static int refdb_fs_backend__write_tail(
13171317static int refdb_fs_backend__delete (
13181318 git_refdb_backend * _backend ,
13191319 const char * ref_name ,
1320+ const git_signature * who ,
1321+ const char * message ,
13201322 const git_oid * old_id , const char * old_target )
13211323{
13221324 git_filebuf file = GIT_FILEBUF_INIT ;
13231325 int error = 0 ;
1326+ git_reference * ref ;
1327+
1328+ if ((error = refdb_fs_backend__lookup (& ref , _backend , ref_name )) < 0 )
1329+ return error ;
13241330
1325- error = refdb_fs_backend__delete_tail (& file , _backend , ref_name , old_id , old_target , 0 );
1331+ error = refdb_fs_backend__delete_tail (& file , _backend , ref , old_id , old_target , 0 , who , message );
13261332 git_filebuf_cleanup (& file );
13271333
13281334 return error ;
@@ -1332,27 +1338,28 @@ static int refdb_fs_backend__delete(
13321338static int refdb_fs_backend__delete_tail (
13331339 git_filebuf * out_lock ,
13341340 git_refdb_backend * _backend ,
1335- const char * ref_name ,
1341+ const git_reference * ref ,
13361342 const git_oid * old_id , const char * old_target ,
1337- git__refdb_flags flags )
1343+ git__refdb_flags flags ,
1344+ const git_signature * who , const char * message )
13381345{
13391346 refdb_fs_backend * backend = (refdb_fs_backend * )_backend ;
13401347 git_buf loose_path = GIT_BUF_INIT ;
1341- int error = 0 , cmp = 0 ;
1348+ int error = 0 , cmp = 0 , should_write = 0 ;
13421349 bool loose_deleted = 0 ;
13431350
1344- assert (backend && ref_name && out_lock );
1351+ assert (backend && ref && out_lock );
13451352
13461353 if (((flags & GIT_REFDB__SKIP_LOCK ) != GIT_REFDB__SKIP_LOCK ) &&
1347- (error = loose_lock (out_lock , backend , ref_name )) < 0 )
1354+ (error = loose_lock (out_lock , backend , ref -> name )) < 0 )
13481355 return error ;
13491356
13501357 if ((flags & GIT_REFDB__SKIP_REFLOG ) != GIT_REFDB__SKIP_REFLOG &&
1351- (error = refdb_reflog_fs__delete (_backend , ref_name )) < 0 ) {
1358+ (error = refdb_reflog_fs__delete (_backend , ref -> name )) < 0 ) {
13521359 goto cleanup ;
13531360 }
13541361
1355- error = cmp_old_ref (& cmp , _backend , ref_name , old_id , old_target );
1362+ error = cmp_old_ref (& cmp , _backend , ref -> name , old_id , old_target );
13561363 if (error < 0 )
13571364 goto cleanup ;
13581365
@@ -1363,7 +1370,7 @@ static int refdb_fs_backend__delete_tail(
13631370 }
13641371
13651372 /* If a loose reference exists, remove it from the filesystem */
1366- if (git_buf_joinpath (& loose_path , backend -> gitpath , ref_name ) < 0 )
1373+ if (git_buf_joinpath (& loose_path , backend -> gitpath , ref -> name ) < 0 )
13671374 return -1 ;
13681375
13691376 error = p_unlink (loose_path .ptr );
@@ -1374,14 +1381,25 @@ static int refdb_fs_backend__delete_tail(
13741381 else if (error == 0 )
13751382 loose_deleted = 1 ;
13761383
1377- if ((error = packed_delete (backend , ref_name )) < 0 && error != GIT_ENOTFOUND )
1384+ if ((error = packed_delete (backend , ref -> name )) < 0 && error != GIT_ENOTFOUND )
13781385 goto cleanup ;
13791386
13801387 if (error == GIT_ENOTFOUND ) {
1381- error = loose_deleted ? 0 : ref_error_notfound (ref_name );
1388+ error = loose_deleted ? 0 : ref_error_notfound (ref -> name );
13821389 goto cleanup ;
13831390 }
13841391
1392+ if ((flags & GIT_REFDB__SKIP_REFLOG ) == 0 ) {
1393+ if ((error = should_write_reflog (& should_write , backend -> repo , ref -> name )) < 0 )
1394+ goto cleanup ;
1395+
1396+ if (should_write ) {
1397+ const git_oid * old_id = git_reference_target (ref );
1398+ if ((error = maybe_append_head (backend , ref , old_id , NULL , who , message )) < 0 )
1399+ goto cleanup ;
1400+ }
1401+ }
1402+
13851403cleanup :
13861404 git_buf_free (& loose_path );
13871405
@@ -1411,7 +1429,7 @@ static int refdb_fs_backend__rename(
14111429 (error = refdb_fs_backend__lookup (& old , _backend , old_name )) < 0 )
14121430 return error ;
14131431
1414- if ((error = refdb_fs_backend__delete (_backend , old_name , NULL , NULL )) < 0 ) {
1432+ if ((error = refdb_fs_backend__delete (_backend , old_name , who , message , NULL , NULL )) < 0 ) {
14151433 git_reference_free (old );
14161434 return error ;
14171435 }
@@ -1864,6 +1882,7 @@ static int reflog_append(refdb_fs_backend *backend, const git_reference *ref, co
18641882 error = git_reference_name_to_id (& new_id , repo , git_reference_symbolic_target (ref ));
18651883 if (error < 0 && error != GIT_ENOTFOUND )
18661884 return error ;
1885+
18671886 /* detaching HEAD does not create an entry */
18681887 if (error == GIT_ENOTFOUND )
18691888 return 0 ;
0 commit comments