From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] rebase: new option to post edit a squashed or fixed up commit
Date: Mon, 10 Mar 2014 12:47:20 -0700 [thread overview]
Message-ID: <xmqqob1drg3b.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1394334737-17406-1-git-send-email-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Sun, 9 Mar 2014 10:12:17 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> After squashing or fixing up, you may want to have a final look at the
> commit, edit some more if needed or even do some testing. --postedit
> enables that. This is (to me) a paranoid mode so either I enable it
> for all squashes and fixups, or none. Hence a new option, not new todo
> commands that give finer selection.
If we were to adopt Michael's (?) idea of allowing flags to each
insn in the insn sheet, would this restriction be easily lifted?
That is, instead of saying "squash", you say "squash --stop" or
something.
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index a1adae8..42061fc 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -571,6 +571,11 @@ do_next () {
> ;;
> esac
> record_in_rewritten $sha1
> + if test -n "$postedit"
> + then
> + warn "Stopped at $sha1... $rest"
> + exit_with_patch $sha1 0
> + fi
> ;;
I would have expected that any new code would stop only at the last
squash (or fixup) in a series of squashes, but this appears to stop
even at an intermediate squashed result, which will not appear in
the final history. Am I misreading the patch (or misunderstanding
the intent of the patch)?
next prev parent reply other threads:[~2014-03-10 19:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-09 3:12 [PATCH] rebase: new option to post edit a squashed or fixed up commit Nguyễn Thái Ngọc Duy
2014-03-10 19:47 ` Junio C Hamano [this message]
2014-03-11 10:01 ` 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=xmqqob1drg3b.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.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 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.