diff options
| -rw-r--r-- | builtin/fetch.c | 9 | ||||
| -rwxr-xr-x | t/t5510-fetch.sh | 13 |
2 files changed, 21 insertions, 1 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 80a64d0d26..5fb6d6bcf1 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1732,8 +1732,15 @@ static int do_fetch(struct transport *transport, goto cleanup; retcode = ref_transaction_commit(transaction, &err); - if (retcode) + if (retcode) { + /* + * Explicitly handle transaction cleanup to avoid + * aborting an already closed transaction. + */ + ref_transaction_free(transaction); + transaction = NULL; goto cleanup; + } } commit_fetch_head(&fetch_head); diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 0890b9f61c..4fcf2209f5 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -345,6 +345,19 @@ test_expect_success 'fetch --atomic --append appends to FETCH_HEAD' ' test_cmp expected atomic/.git/FETCH_HEAD ' +test_expect_success REFFILES 'fetch --atomic fails transaction if reference locked' ' + test_when_finished "rm -rf upstream repo" && + + git init upstream && + git -C upstream commit --allow-empty -m 1 && + git -C upstream switch -c foobar && + git clone --mirror upstream repo && + git -C upstream commit --allow-empty -m 2 && + touch repo/refs/heads/foobar.lock && + + test_must_fail git -C repo fetch --atomic origin +' + test_expect_success '--refmap="" ignores configured refspec' ' cd "$TRASH_DIRECTORY" && git clone "$D" remote-refs && |