From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
To: gitster@pobox.com
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org,
martin.agren@gmail.com, phillip.wood123@gmail.com,
rohit.ashiwal265@gmail.com
Subject: Re: [GSoC][PATCH 1/1] rebase -i: add --ignore-whitespace flag
Date: Tue, 16 Jul 2019 03:30:10 +0530 [thread overview]
Message-ID: <20190715220010.8146-1-rohit.ashiwal265@gmail.com> (raw)
In-Reply-To: <xmqqlfwz41vl.fsf@gitster-ct.c.googlers.com>
Hi Junio
On Mon, 15 Jul 2019 10:57:18 -0700 Junio C Hamano <gitster@pobox.com> wrote:
>
> Rohit Ashiwal <rohit.ashiwal265@gmail.com> writes:
>
> > + if (opts->ignore_whitespace) {
> > + struct strbuf buf = STRBUF_INIT;
> > +
> > + if (opts->strategy_opts)
> > + strbuf_addstr(&buf, opts->strategy_opts);
> > +
> > + strbuf_addstr(&buf, " --ignore-space-change");
> > + free(opts->strategy_opts);
>
> Is this call to free() safe?
Yes, as far as I can tell. Since up till now, `strategy_opts` is
either "NULL" or xstrdup()'d string. There is no double free involved.
> > + opts->strategy_opts = strbuf_detach(&buf, NULL);
> > + }
> > +
> > @@ -1821,6 +1836,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
> > }
> >
> > if (options.rebase_merges) {
> > + if (options.ignore_whitespace)
> > + die(_("cannot combine '--rebase-merges' with "
> > + "'--ignore-whitespace'"));
>
> Hmph, this is unfortunate. The patch is not making things worse, though.
Actually, there is no need for --rebase-merges and --ignore-whitespace
to be "incompatible". My mentors also agree on this one. Making them
work in harmony will be handled in another patch series.
Best
Rohit
next prev parent reply other threads:[~2019-07-15 22:02 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 18:50 [GSoC][PATCH 0/1] rebase -i: support --ignore-whitespace Rohit Ashiwal
2019-07-12 18:50 ` [GSoC][PATCH 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-15 17:57 ` Junio C Hamano
2019-07-15 22:00 ` Rohit Ashiwal [this message]
2019-07-15 22:08 ` Junio C Hamano
2019-07-15 22:42 ` Rohit Ashiwal
2019-07-12 18:53 ` [GSoC][PATCH 0/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 " Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-18 19:03 ` [GSoC][PATCH v2 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-19 22:36 ` Junio C Hamano
2019-08-02 20:57 ` Rohit Ashiwal
2019-07-20 14:56 ` Phillip Wood
2019-07-23 19:57 ` Rohit Ashiwal
2019-07-24 13:33 ` Phillip Wood
2019-07-19 21:26 ` [GSoC][PATCH v2 0/2] " Junio C Hamano
2019-07-19 21:47 ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 1/2] sequencer: add NULL checks under read_author_script Rohit Ashiwal
2019-07-15 18:04 ` Junio C Hamano
2019-07-12 18:53 ` [GSoC][PATCH 2/2] rebase -i: support --committer-date-is-author-date Rohit Ashiwal
2019-07-14 11:31 ` Rohit Ashiwal
2019-07-18 18:55 ` [GSoC][PATCH v2 0/1] rebase -i: support --ignore-whitespace Rohit Ashiwal
2019-07-18 18:55 ` [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag Rohit Ashiwal
2019-07-19 21:33 ` Junio C Hamano
2019-07-23 19:59 ` Rohit Ashiwal
2019-07-23 20:57 ` Junio C Hamano
2019-07-22 10:00 ` Phillip Wood
2019-07-23 19:58 ` Rohit Ashiwal
2019-07-23 21:01 ` Elijah Newren
2019-07-24 11:14 ` Johannes Schindelin
2019-07-24 21:18 ` [GSoC][PATCH v3 0/1] " Rohit Ashiwal
2019-07-24 21:18 ` [GSoC][PATCH v3 1/1] " Rohit Ashiwal
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=20190715220010.8146-1-rohit.ashiwal265@gmail.com \
--to=rohit.ashiwal265@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=phillip.wood123@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.
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).