Skip to content

Commit b75456b

Browse files
committed
Merge branch 'kn/reflog-migration' into next
"git refs migrate" learned to also migrate the reflog data across backends. * kn/reflog-migration: refs: mark invalid refname message for translation
2 parents 7a2aad7 + 8ddcdc1 commit b75456b

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

refs.c

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,14 +1256,22 @@ static int transaction_refname_valid(const char *refname,
12561256
return 1;
12571257

12581258
if (is_pseudo_ref(refname)) {
1259-
const char *what = flags & REF_LOG_ONLY ? "reflog for pseudoref" : "pseudoref";
1260-
strbuf_addf(err, _("refusing to update %s '%s'"), what, refname);
1259+
const char *refusal_msg;
1260+
if (flags & REF_LOG_ONLY)
1261+
refusal_msg = _("refusing to update reflog for pseudoref '%s'");
1262+
else
1263+
refusal_msg = _("refusing to update pseudoref '%s'");
1264+
strbuf_addf(err, refusal_msg, refname);
12611265
return 0;
12621266
} else if ((new_oid && !is_null_oid(new_oid)) ?
12631267
check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
12641268
!refname_is_safe(refname)) {
1265-
const char *what = flags & REF_LOG_ONLY ? "reflog with bad name" : "ref with bad name";
1266-
strbuf_addf(err, _("refusing to update %s '%s'"), what, refname);
1269+
const char *refusal_msg;
1270+
if (flags & REF_LOG_ONLY)
1271+
refusal_msg = _("refusing to update reflog with bad name '%s'");
1272+
else
1273+
refusal_msg = _("refusing to update ref with bad name '%s'");
1274+
strbuf_addf(err, refusal_msg, refname);
12671275
return 0;
12681276
}
12691277

0 commit comments

Comments
 (0)