From: Sergio Callegari <sergio.callegari@gmail.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: disallowing push to currently checked-out branch
Date: Mon, 16 Feb 2009 18:13:58 +0100 [thread overview]
Message-ID: <49999ED6.7010608@gmail.com> (raw)
In-Reply-To: <20090216135812.GA20377@coredump.intra.peff.net>
Jeff King wrote:
> On Mon, Feb 16, 2009 at 10:17:01AM +0000, Sergio Callegari wrote:
>
>
>>> For people who do not follow the git list regularly, a "HEAD contain the
>>> actual commit" is often called "detached".
>>>
>> Could you have that done automatically?
>> Namely rather to denying push to a branch b where HEAD->b, when you get such
>> push you detach head?
>>
>
> See
>
> http://article.gmane.org/gmane.comp.version-control.git/108923
>
> for discussion.
>
> -Peff
>
Thanks for the pointer!
However, wrt point 1)
> If you set 'detach' option, this clueless user is not helped; he will
> happily keep working and would make tons of commits on detached HEAD,
> and next time he switches to another branch, will lose all of them.
>
I guess that git does not let you commit on a detached head without
crying out loud.
Furthermore, one could do just a bit more than detaching, namely store
the fact that head got detached and the name of the branch where the
head was.
With this, when the unconscious user types git status or git commit the
system could alert him that head got detached because someone updated
the branch behind his shoulders from remote... and then suggest the
option to either create a new branch from the detached head (I believe
that this is what gets suggested anyway when one tries to commit from a
detached head) or to stash the current tree status, get back onto the
former branch and try applying the changes on the new head of the branch.
The flag triggering this warning at a git status or git commit command
should then be cleared at the first occasion when the head is changed.
To me this seems natural and helpful. Am I missing something?
Sergio
next prev parent reply other threads:[~2009-02-16 17:15 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-15 21:31 [RFC - draft] List of proposed future changes that are backward incompatible Junio C Hamano
2009-02-15 21:48 ` Junio C Hamano
2009-02-15 22:56 ` Jakub Narebski
2009-02-15 23:39 ` Junio C Hamano
2009-02-15 23:20 ` Heikki Orsila
2009-02-16 0:04 ` disallowing push to currently checked-out branch Jeff King
2009-02-16 1:33 ` david
2009-02-16 1:47 ` david
2009-02-16 1:30 ` Julian Phillips
2009-02-16 4:01 ` Jeff King
2009-02-16 8:33 ` Daniel Barkalow
2009-02-16 8:51 ` Junio C Hamano
2009-02-16 10:17 ` Sergio Callegari
2009-02-16 13:58 ` Jeff King
2009-02-16 17:13 ` Sergio Callegari [this message]
2009-02-16 17:33 ` Matthieu Moy
2009-02-16 17:43 ` Johannes Schindelin
2009-02-16 18:48 ` Jay Soffian
2009-02-16 20:02 ` Johannes Schindelin
2009-02-16 21:12 ` Jay Soffian
2009-02-16 21:15 ` Johannes Schindelin
2009-02-16 22:28 ` Jay Soffian
2009-02-16 22:52 ` Jeff King
2009-02-17 5:53 ` Jay Soffian
2009-02-17 11:28 ` PUSH_HEAD, was " Johannes Schindelin
2009-02-17 17:29 ` Jay Soffian
2009-02-17 19:48 ` Jeff King
2009-02-17 22:20 ` Junio C Hamano
2009-02-17 22:42 ` Jay Soffian
2009-02-17 22:54 ` Johannes Schindelin
2009-02-16 19:24 ` Sergio Callegari
2009-02-16 20:09 ` Johannes Schindelin
2009-02-16 21:42 ` Jay Soffian
2009-02-17 0:07 ` Sergio Callegari
2009-02-17 0:18 ` Johannes Schindelin
2009-02-17 0:41 ` Sergio Callegari
2009-02-17 0:56 ` Johannes Schindelin
2009-02-17 1:18 ` Junio C Hamano
2009-02-17 0:57 ` Junio C Hamano
2009-02-16 21:43 ` Junio C Hamano
2009-02-16 22:43 ` Jeff King
2009-02-16 23:23 ` Junio C Hamano
2009-02-17 0:23 ` Jeff King
2009-02-17 0:43 ` Junio C Hamano
2009-02-17 1:29 ` Jeff King
2009-02-16 3:50 ` Jeff King
2009-02-16 5:05 ` david
2009-02-16 4:05 ` Jeff King
2009-02-16 5:18 ` david
2009-02-16 4:37 ` Jeff King
2009-02-16 5:55 ` david
2009-02-16 5:06 ` Jeff King
2009-02-16 10:53 ` Johannes Schindelin
2009-02-16 10:50 ` dashed commands, was " Johannes Schindelin
2009-02-15 23:53 ` [RFC - draft] List of proposed future changes that are backward incompatible david
2009-02-15 23:01 ` Johannes Schindelin
2009-02-15 23:36 ` Junio C Hamano
2009-02-16 0:14 ` david
2009-02-15 23:18 ` Johannes Schindelin
2009-02-16 0:38 ` david
2009-02-16 0:29 ` Junio C Hamano
2009-02-16 10:23 ` Johannes Schindelin
2009-02-16 15:33 ` david
2009-02-16 14:40 ` Sverre Rabbelier
2009-02-16 0:02 ` disallowing push to currently checked-out branch Jeff King
2009-02-16 10:06 ` Sergio Callegari
2009-02-15 23:01 ` [RFC - draft] List of proposed future changes that are backward incompatible Jakub Narebski
2009-02-15 23:15 ` Johannes Schindelin
2009-02-15 23:38 ` Jakub Narebski
2009-02-16 0:35 ` david
2009-02-16 0:07 ` send-email sending shallow threads by default Jeff King
2009-02-16 0:09 ` Pieter de Bie
2009-02-16 2:43 ` Jeff King
2009-02-16 2:55 ` Brian Gernhardt
2009-02-16 9:56 ` Wincent Colaiuta
2009-02-16 7:55 ` SZEDER Gábor
2009-02-16 10:38 ` Martin Mares
2009-02-17 8:34 ` Andreas Ericsson
2009-02-17 9:06 ` Martin Mares
2009-02-17 19:28 ` Jeff King
2009-02-20 3:03 ` Eric W. Biederman
2009-02-20 3:26 ` Jeff King
2009-02-20 4:13 ` Eric W. Biederman
2009-02-17 8:30 ` Andreas Ericsson
2009-02-16 1:27 ` [RFC - draft] List of proposed future changes that are backward incompatible Sitaram Chamarty
2009-02-16 8:04 ` Björn Steinbrink
2009-02-16 8:49 ` Junio C Hamano
2009-02-16 9:07 ` Björn Steinbrink
2009-02-16 2:42 ` [RFC - draft #2] " Junio C Hamano
2009-02-16 3:20 ` Jeff King
2009-02-16 21:10 ` Jakub Narebski
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=49999ED6.7010608@gmail.com \
--to=sergio.callegari@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).