From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jacob Keller <jacob.keller@gmail.com>,
Git mailing list <git@vger.kernel.org>
Subject: Re: tools for easily "uncommitting" parts of a patch I just commited?
Date: Thu, 20 Oct 2016 09:30:05 -0700 [thread overview]
Message-ID: <xmqqa8dzhtki.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20161020021323.tav5glu7xy4u7mtj@sigill.intra.peff.net> (Jeff King's message of "Wed, 19 Oct 2016 22:13:23 -0400")
Jeff King <peff@peff.net> writes:
>> I still think it's worth while to add a check for git-commit which
>> does something like check when we say "git commit <files>" and if the
>> index already has those files marked as being changed, compare them
>> with the current contents of the file as in the checkout and quick
>> saying "please don't do that" so as to avoid the problem in the first
>> place.
> ...
> I suspect both of those would complain about legitimate workflows.
>
> I dunno. I do not ever use "git commit <file>" myself.
Users are different. I do use this all the time, and it is not
unusual at all to have changed contents on paths other than <file>
already added to the index when I do so, i.e. an unrelated small
typofix in <file> jumping ahead of the real changes I am working on
in other parts of the tree.
"Please don't do that" would break. Jacob says "avoid the problem",
but I do not see a problem in allowing it (it could be that the
problem Jacob has is in other parts of his workflow, but I do not
know what it is offhand).
next prev parent reply other threads:[~2016-10-20 16:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-19 22:26 tools for easily "uncommitting" parts of a patch I just commited? Jacob Keller
2016-10-19 22:42 ` Jeff King
2016-10-19 23:36 ` Jacob Keller
2016-10-20 2:13 ` Jeff King
2016-10-20 5:53 ` Jacob Keller
2016-10-20 16:30 ` Junio C Hamano [this message]
2016-10-20 17:27 ` Jacob Keller
2016-10-20 17:39 ` Junio C Hamano
2016-10-20 18:13 ` Jacob Keller
2016-10-20 18:41 ` Junio C Hamano
2016-10-20 20:03 ` Jacob Keller
2016-10-22 9:19 ` Lukas Fleischer
2016-10-23 1:07 ` Jacob Keller
2016-10-23 1:23 ` Duy Nguyen
2016-10-23 1:38 ` Jeff King
2016-10-23 10:27 ` Duy Nguyen
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=xmqqa8dzhtki.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.