From: Rohit Ashiwal <rohit.ashiwal265@gmail.com> To: rohit.ashiwal265@gmail.com Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, gitster@pobox.com, martin.agren@gmail.com, phillip.wood123@gmail.com, t.gummerer@gmail.com, newren@gmail.com Subject: [GSoC][PATCH v3 0/1] rebase -i: add --ignore-whitespace flag Date: Thu, 25 Jul 2019 02:48:45 +0530 Message-ID: <20190724211846.18131-1-rohit.ashiwal265@gmail.com> (raw) In-Reply-To: <20190712185015.20585-1-rohit.ashiwal265@gmail.com> This revision removes --ignore-whitespace from rebase--interactive since its only caller preserve-merges is now deprecated. Also rename t3431 to t3433. Rohit Ashiwal (1): rebase -i: add --ignore-whitespace flag Documentation/git-rebase.txt | 10 +++- builtin/rebase.c | 26 ++++++++-- t/t3422-rebase-incompatible-options.sh | 1 - t/t3433-rebase-options-compatibility.sh | 66 +++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 7 deletions(-) create mode 100755 t/t3433-rebase-options-compatibility.sh Range-diff: 1: a1bb91fe43 ! 1: eef6f6fa25 rebase -i: add --ignore-whitespace flag @@ -42,6 +42,7 @@ * --preserve-merges and --interactive * --preserve-merges and --signoff * --preserve-merges and --rebase-merges ++ * --preserve-merges and --ignore-whitespace + * --rebase-merges and --ignore-whitespace * --rebase-merges and --strategy * --rebase-merges and --strategy-option @@ -59,9 +60,19 @@ int autostash; char *cmd; @@ - flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0; - flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0; + .git_format_patch_opt = STRBUF_INIT \ + } + +-static struct replay_opts get_replay_opts(const struct rebase_options *opts) ++static struct replay_opts get_replay_opts(struct rebase_options *opts) + { + struct replay_opts replay = REPLAY_OPTS_INIT; +@@ + replay.reschedule_failed_exec = opts->reschedule_failed_exec; + replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt); + replay.strategy = opts->strategy; ++ + if (opts->ignore_whitespace) { + struct strbuf buf = STRBUF_INIT; + @@ -72,19 +83,9 @@ + free(opts->strategy_opts); + opts->strategy_opts = strbuf_detach(&buf, NULL); + } -+ - switch (command) { - case ACTION_NONE: { - if (!opts->onto && !opts->upstream) -@@ - { OPTION_STRING, 'S', "gpg-sign", &opts.gpg_sign_opt, N_("key-id"), - N_("GPG-sign commits"), - PARSE_OPT_OPTARG, NULL, (intptr_t) "" }, -+ OPT_BOOL(0, "ignore-whitespace", &opts.ignore_whitespace, -+ N_("ignore changes in whitespace")), - OPT_STRING(0, "strategy", &opts.strategy, N_("strategy"), - N_("rebase strategy")), - OPT_STRING(0, "strategy-opts", &opts.strategy_opts, N_("strategy-opts"), + if (opts->strategy_opts) + parse_strategy_opts(&replay, opts->strategy_opts); + @@ argc = parse_options(argc, argv, NULL, options, builtin_rebase_interactive_usage, PARSE_OPT_KEEP_ARGV0); @@ -133,18 +134,6 @@ die(_("cannot combine '--rebase-merges' with " "'--strategy-option'")); - diff --git a/sequencer.h b/sequencer.h - --- a/sequencer.h - +++ b/sequencer.h -@@ - int verbose; - int quiet; - int reschedule_failed_exec; -+ int ignore_whitespace; - - int mainline; - - diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -157,10 +146,10 @@ test_rebase_am_only -C4 - diff --git a/t/t3431-rebase-options-compatibility.sh b/t/t3431-rebase-options-compatibility.sh + diff --git a/t/t3433-rebase-options-compatibility.sh b/t/t3433-rebase-options-compatibility.sh new file mode 100755 --- /dev/null - +++ b/t/t3431-rebase-options-compatibility.sh + +++ b/t/t3433-rebase-options-compatibility.sh @@ +#!/bin/sh +# @@ -184,7 +173,7 @@ + EOF + git add file && + git commit -m "add file" && -+ q_to_tab >file <<-EOF && ++ cat >file <<-EOF && + line 1 + new line 2 + line 3 @@ -193,7 +182,7 @@ + git tag side && + + git checkout --orphan master && -+ q_to_tab >file <<-EOF && ++ cat >file <<-EOF && + line 1 + line 2 + line 3 -- 2.21.0
next prev parent reply other threads:[~2019-07-24 21:21 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 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 ` Rohit Ashiwal [this message] 2019-07-24 21:18 ` [GSoC][PATCH v3 " 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=20190724211846.18131-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=newren@gmail.com \ --cc=phillip.wood123@gmail.com \ --cc=t.gummerer@gmail.com \ --subject='Re: [GSoC][PATCH v3 0/1] rebase -i: add --ignore-whitespace flag' \ /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
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git