Re: [PATCH v6 2/8] push: add advice for rejected tag reference

2012-12-02 Thread Junio C Hamano
Chris Rorvick writes: > 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_r

[PATCH v6 2/8] push: add advice for rejected tag reference

2012-11-29 Thread Chris Rorvick
Advising the user to fetch and merge only makes sense if the rejected reference is a branch. If none of the rejections are for branches, just tell the user the reference already exists. Signed-off-by: Chris Rorvick --- builtin/push.c | 11 +++ cache.h| 1 + remote.c | 10