From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/3] rebase -i --keep-empty: don't prune empty commits
Date: Tue, 20 Mar 2018 16:33:46 +0100 (STD) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1803201630380.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz> (raw)
In-Reply-To: <20180320100315.15261-3-phillip.wood@talktalk.net>
Hi Phillip,
On Tue, 20 Mar 2018, Phillip Wood wrote:
> diff --git a/sequencer.c b/sequencer.c
> index 4d3f60594c..96ff812c8d 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -2470,7 +2470,7 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
> init_revisions(&revs, NULL);
> revs.verbose_header = 1;
> revs.max_parents = 1;
> - revs.cherry_pick = 1;
> + revs.cherry_mark = 1;
This will conflict with my --recreate-merges patch series, but in a good
way.
> @@ -2495,14 +2495,18 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
> return error(_("make_script: error preparing revisions"));
>
> while ((commit = get_revision(&revs))) {
> + int is_empty = is_original_commit_empty(commit);
> +
> strbuf_reset(&buf);
> - if (!keep_empty && is_original_commit_empty(commit))
> + if (!keep_empty && is_empty)
> strbuf_addf(&buf, "%c ", comment_line_char);
> - strbuf_addf(&buf, "%s %s ", insn,
> - oid_to_hex(&commit->object.oid));
> - pretty_print_commit(&pp, commit, &buf);
> - strbuf_addch(&buf, '\n');
> - fputs(buf.buf, out);
> + if (is_empty || !(commit->object.flags & PATCHSAME)) {
May I suggest inverting the logic here, to make the code more obvious and
also to avoid indenting the block even further?
if (!is_empty && (commit->object.flags & PATCHSAME))
continue;
> + strbuf_addf(&buf, "%s %s ", insn,
> + oid_to_hex(&commit->object.oid));
> + pretty_print_commit(&pp, commit, &buf);
> + strbuf_addch(&buf, '\n');
> + fputs(buf.buf, out);
> + }
> }
> strbuf_release(&buf);
> return 0;
Thanks,
Dscho
next prev parent reply other threads:[~2018-03-20 15:34 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-20 10:03 [PATCH 0/3] rebase --keep-empty/--root fixes Phillip Wood
2018-03-20 10:03 ` [PATCH 1/3] rebase --root: stop assuming squash_onto is unset Phillip Wood
2018-03-20 10:03 ` [PATCH 2/3] rebase -i --keep-empty: don't prune empty commits Phillip Wood
2018-03-20 15:33 ` Johannes Schindelin [this message]
2018-03-20 17:34 ` Junio C Hamano
2018-03-20 18:39 ` Phillip Wood
2018-03-21 22:38 ` Johannes Schindelin
2018-03-29 18:05 ` Junio C Hamano
2018-03-20 10:03 ` [PATCH 3/3] rebase: respect --no-keep-empty Phillip Wood
[not found] ` <nycvar.QRO.7.76.6.1803201634260.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
2018-03-20 15:36 ` [PATCH 0/3] rebase --keep-empty/--root fixes Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1803201630380.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).