Re: [PATCH v6 2/8] push: add advice for rejected tag reference
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:55:28
Chris Rorvick [off-list ref] writes:
quoted hunk ↗ jump to hunk
static void advise_pull_before_push(void) { if (!advice_push_non_ff_current || !advice_push_nonfastforward)@@ -241,6 +245,11 @@ static void advise_checkout_pull_push(void) advise(_(message_advice_checkout_pull_push)); } +static void advise_ref_already_exists(void) +{ + advise(_(message_advice_ref_already_exists)); +} + static int push_with_options(struct transport *transport, int flags) { int err;@@ -272,6 +281,8 @@ static int push_with_options(struct transport *transport, int flags) advise_use_upstream(); else advise_checkout_pull_push(); + } else if (reject_reasons & REJECT_ALREADY_EXISTS) { + advise_ref_already_exists(); }
The existing advise_* functions that are called from this function honor the advice.* configuration, and advise_ref_already_exists() would want to follow suit here (it is OK to do so as a follow-up patch without further rerolling the entire series). Thanks.