From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id DC4D21F45A for ; Tue, 13 Aug 2019 12:07:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727676AbfHMMHS (ORCPT ); Tue, 13 Aug 2019 08:07:18 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40789 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726600AbfHMMHS (ORCPT ); Tue, 13 Aug 2019 08:07:18 -0400 Received: by mail-wr1-f65.google.com with SMTP id r1so8425376wrl.7 for ; Tue, 13 Aug 2019 05:07:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=TBXForsl40VrNZ3Rg+EQ3DKi0Wwu7HBN6IBzpD+khFo=; b=oymEkbk2wcQDBF3+dak21Wzkppw65OXIw8tAlyfA1XAWJSULmq0XdrqzYwScVkgZWn ARSDXTugH+ML2T961ybbqGVTeCrGhskpyuHnCfDSnIwoGNhUNzGiQ9cQuRRwjonaezNF Qw0dU9fWK2nQJ1OYy0pcVo2b3ipmQR7R0IJGZuTUJrL1mKkBUpm+ARPuZlP3fSt4XjBI /WpKcI/kmjTc4tCFhUE2pkaWEVZ5KO4dpjnyHlbMs20GtOMw901PL9CAnYXPg7Fo2XRG Wr8/dquTUjfhXxDQdYVP1RXnKA9YJY9Qb3JCoBohDEZDyoac9/I9Gk/05JkwNxEMydC0 0Ntw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=TBXForsl40VrNZ3Rg+EQ3DKi0Wwu7HBN6IBzpD+khFo=; b=m0MlSpTSa7stVTBe1f0fXghLj/Gp20Bv7QmcmQb57jFH8DS4VLmgVFn0ABv4LEPjS/ GS9QCrfJ9+qW93DT9mke6eKifuf07JmMYYBG+CsIg34cT+XPKuQ3Cs+SWI/u3/uriLsB B/qjRrwWA7eC5o1KHaErVtQsC9FB7c+PkiEa3AtiUMIXEhXxsE3P+WyF0eXblCjnp28j 946aRynx4i8BkIvhNwLQtYH2LrPEr8HWyGm5tm4vYhK7rCRT0d4xCPILhxKdBIX2GmxF XDa9ocwFcNBeL8+zdMXfsBPVWkYTh/WwYud+vVQBLbkxxk8IKtawxmELK6EvE2OEeyJs zpJw== X-Gm-Message-State: APjAAAVdVK+29L+5Vn1bo1LjNBKwwrn4i2eqqsnj9IaOreaCq4/NSPT3 CNtYxDd6Uowiasf5lrkAGTo= X-Google-Smtp-Source: APXvYqx5A3lS28zLCrgkJT+rySOLVZMSjoCzZJUZH6AubVjaUB1kj0B3WL/iJOpSC5890OLQRUR0zw== X-Received: by 2002:adf:e602:: with SMTP id p2mr46782751wrm.306.1565698033954; Tue, 13 Aug 2019 05:07:13 -0700 (PDT) Received: from [192.168.1.18] (host-78-148-43-8.as13285.net. [78.148.43.8]) by smtp.gmail.com with ESMTPSA id b2sm16590700wrf.94.2019.08.13.05.07.11 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 13 Aug 2019 05:07:12 -0700 (PDT) Subject: Re: [GSoC][PATCH v2 1/6] rebase -i: add --ignore-whitespace flag To: Rohit Ashiwal Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, gitster@pobox.com, martin.agren@gmail.com, newren@gmail.com, t.gummerer@gmail.com References: <20190806173638.17510-1-rohit.ashiwal265@gmail.com> <20190812194301.5655-1-rohit.ashiwal265@gmail.com> <20190812194301.5655-2-rohit.ashiwal265@gmail.com> From: Phillip Wood Message-ID: Date: Tue, 13 Aug 2019 13:07:11 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190812194301.5655-2-rohit.ashiwal265@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-HK Content-Transfer-Encoding: 7bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Hi Rohit Thanks for the re-roll On 12/08/2019 20:42, Rohit Ashiwal wrote: > There are two backends available for rebasing, viz, the am and the > interactive. Naturally, there shall be some features that are > implemented in one but not in the other. One such flag is > --ignore-whitespace which indicates merge mechanism to treat lines > with only whitespace changes as unchanged. Wire the interactive > rebase to also understand the --ignore-whitespace flag by > translating it to -Xignore-space-change. > > Signed-off-by: Rohit Ashiwal > --- > Documentation/git-rebase.txt | 10 +++- > builtin/rebase.c | 29 +++++++++-- > t/t3422-rebase-incompatible-options.sh | 1 - > t/t3433-rebase-options-compatibility.sh | 65 +++++++++++++++++++++++++ > 4 files changed, 97 insertions(+), 8 deletions(-) > create mode 100755 t/t3433-rebase-options-compatibility.sh > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 6156609cf7..28e5e08a83 100644 > --- a/Documentation/git-rebase.txt > +++ b/Documentation/git-rebase.txt > @@ -371,8 +371,13 @@ If either or --root is given on the command line, then the > default is `--no-fork-point`, otherwise the default is `--fork-point`. > > --ignore-whitespace:: > + This flag is either passed to the 'git apply' program > + (see linkgit:git-apply[1]), or to 'git merge' program > + (see linkgit:git-merge[1]) as `-Xignore-space-change`, > + depending on which backend is selected by other options. I still think this should document what it does rather than how it is implemented - see my previous comments. > + > --whitespace=