From: Andreas Ericsson <ae@op5.se>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] push: --ignore-stale option
Date: Wed, 14 Dec 2011 00:48:54 +0100 [thread overview]
Message-ID: <4EE7E466.4060406@op5.se> (raw)
In-Reply-To: <7vobvct58u.fsf@alter.siamese.dyndns.org>
On 12/14/2011 12:35 AM, Junio C Hamano wrote:
>
> You however should be testing these 7 before pushing them out anyway,
> and the sane way to do so is to check one out, test it, push it, and
> iterate that sequence 7 times. If you do so, a workable alternative is
> to use the configuration to push the current branch and you do not need
> this patch series at all.
>
> Perhaps this series encourages a wrong workflow in that sense. I dunno.
>
I for one really love it and will probably make an alias to use for most of
my repos. With 'maint' branches (with topics) being worked on by one team and
'master' (with topics) being worked on by a different group, but all branches
generally checked out, tracked and touched by everyone sooner or later, I've
come to just ignore the "not fast-forward" error. I've never stopped loathing
it though, since git should just *know* that it doesn't fast-forward because
I haven't done anything and not because I've done something (and maybe
forgotten to push) and someone else has done something different, which would
actually be interesting for me to know.
So big thumbs up and three loud "hurrah"'s for this.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
next prev parent reply other threads:[~2011-12-13 23:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-13 23:35 [PATCH 2/2] push: --ignore-stale option Junio C Hamano
2011-12-13 23:48 ` Andreas Ericsson [this message]
2011-12-15 7:38 ` Jeff King
2011-12-15 17:47 ` Marc Branchaud
2011-12-15 18:21 ` Junio C Hamano
2011-12-19 5:33 ` Junio C Hamano
2011-12-19 5:35 ` [PATCH 1/2] advice: Document that they all default to true Junio C Hamano
2011-12-19 9:37 ` Jeff King
2011-12-19 5:38 ` [PATCH 2/2] push: hint to use push.default=upstream when appropriate Junio C Hamano
2011-12-19 10:37 ` Jeff King
2011-12-19 20:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EE7E466.4060406@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).