git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] push: --ignore-stale option

From
Andreas Ericsson <ae@op5.se>
Date
Dec 13, 2011, 23:48 UTC
Message-ID
<4EE7E466.4060406@op5.se>
In-Reply-To
<7vobvct58u.fsf@alter.siamese.dyndns.org>
On 12/14/2011 12:35 AM, Junio C Hamano wrote:
Show 9 quoted lines
> 
>     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.
Previous: Junio C HamanoNext: Jeff King
Message 2 of 11 in “push: --ignore-stale option”
  1. 2/2 push: --ignore-stale optionJunio C Hamano, Dec 13, 2011
  2. Andreas EricssonDec 13, 2011
  3. Jeff KingDec 15, 2011
  4. Marc BranchaudDec 15, 2011
  5. Junio C HamanoDec 15, 2011
  6. Junio C HamanoDec 19, 2011
  7. 1/2 advice: Document that they all default to trueJunio C Hamano, Dec 19, 2011
  8. Jeff KingDec 19, 2011
  9. 2/2 push: hint to use push.default=upstream when appropriateJunio C Hamano, Dec 19, 2011
  10. Jeff KingDec 19, 2011
  11. Junio C HamanoDec 19, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.