git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Hallvard B Furuseth <h.b.furuseth@usit.uio.no>
To: Alexey Shumkin <Alex.Crezoff@gmail.com>
Cc: <git@vger.kernel.org>
Subject: Re: How to commit incomplete changes?
Date: Thu, 15 Dec 2011 08:11:38 +0100	[thread overview]
Message-ID: <7e1ccfac8c47e8877c0438086bd1d91b@ulrik.uio.no> (raw)
In-Reply-To: <20111215104444.783303cf@ashu.dyn1.rarus.ru>

 On Thu, 15 Dec 2011 10:44:44 +0400, Alexey Shumkin 
 <Alex.Crezoff@gmail.com> wrote:
>> Do people have any feelings or conventions for how and when to
>> publish a series of commits where the first one(s) break something
>> and the next ones clear it up?
>
> I'm curiuos, why to you want to commit changes that break something
> separately from fixup?

 I answered that, but maybe too briefly:

>>  I'm about to commit some small edits which go together with bigger
>>  generated changes.  It seems both more readable and more 
>> cherry-pick-
>>  friendly to me to keep these in separate commits.

 To expand on that: To review the change, review the hand-edited 
 commits,
 which is easier when these do not drown in generated changes.  Review
 the *commands* which generated the rest - I'd put those in the commit
 message - and glance at the actual changes.  Cherry-pick: Possbly you
 need to run the commands instead of cherry-picking the generated
 changes.  That's easier with a commit with only generated changes.

 I know it also can cause problems.  Would you make a single big commit
 anyway, and describe carefully in the commit message which parts are
 hand-edits?  (We don't auto-test commits yet, but I'll sure this issue
 will crop up again later when we do.)

-- 
 Hallvard

  reply	other threads:[~2011-12-15  7:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-14 23:24 How to commit incomplete changes? Hallvard B Furuseth
2011-12-15  6:44 ` Alexey Shumkin
2011-12-15  7:11   ` Hallvard B Furuseth [this message]
2011-12-15  8:22     ` Alexey Shumkin
2011-12-15  8:39       ` Alexey Shumkin
2011-12-15 22:51 ` Neal Kreitzinger
2011-12-16  0:21   ` Junio C Hamano
2011-12-16 12:15     ` Hallvard Breien Furuseth
2011-12-16 12:58       ` Hallvard Breien Furuseth
2011-12-16  1:49 ` Tomas Carnecky

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=7e1ccfac8c47e8877c0438086bd1d91b@ulrik.uio.no \
    --to=h.b.furuseth@usit.uio.no \
    --cc=Alex.Crezoff@gmail.com \
    --cc=git@vger.kernel.org \
    /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).