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

Merge branch 'jx/fetch-atomic-error-message-fix'

Browse Source 
"git fetch --atomic" issued an unnecessary empty error message,
which has been corrected.

* jx/fetch-atomic-error-message-fix:
  fetch: no redundant error message for atomic fetch
  t5574: test porcelain output of atomic fetch
This commit is contained in:
Junio C Hamano
2023-12-27 14:52:27 -08:00
parent a29e8b6059 18ce48918c
commit deb67d12de
2 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
builtin/fetch.c
View File

@ -1651,7 +1651,7 @@ static int do_fetch(struct transport *transport,
if (atomic_fetch) {
transaction = ref_transaction_begin(&err);
if (!transaction) {
retcode = error("%s", err.buf);
retcode = -1;
goto cleanup;
}
}
@ -1711,7 +1711,6 @@ static int do_fetch(struct transport *transport,
retcode = ref_transaction_commit(transaction, &err);
if (retcode) {
error("%s", err.buf);
ref_transaction_free(transaction);
transaction = NULL;
goto cleanup;
@ -1775,9 +1774,14 @@ static int do_fetch(struct transport *transport,
}
cleanup:
if (retcode && transaction) {
ref_transaction_abort(transaction, &err);
error("%s", err.buf);
if (retcode) {
if (err.len) {
error("%s", err.buf);
strbuf_reset(&err);
}
if (transaction && ref_transaction_abort(transaction, &err) &&
err.len)
error("%s", err.buf);
}
display_state_release(&display_state);