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.8 required=3.0 tests=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 58D161F731 for ; Thu, 8 Aug 2019 16:44:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390227AbfHHQoo (ORCPT ); Thu, 8 Aug 2019 12:44:44 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:33119 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728289AbfHHQon (ORCPT ); Thu, 8 Aug 2019 12:44:43 -0400 Received: by mail-wm1-f65.google.com with SMTP id p77so4372030wme.0 for ; Thu, 08 Aug 2019 09:44:41 -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=ObJfRokD+eXGWjqsY995rJw+PzoXoD3y5Nl6sLxpHCo=; b=EVt9MI3GzizvFy5HvvUl62iJsbVW2P3slMXcea25oACgF6EpFsTSli+yvGCeJ18xfF cUd8xWuwMWGqFpPYUBOA8jTGckQlwhhNsUUbmuQ+KvJUVSBfY+6Zj0tuVR2lxQ58tmPs E4ych/N7IH9X+NTtcrBW+XIPSo7iTKjXDRah66M79o/pEszWoiLglWWWT3VpB1terW8o pzMyS5AgQMWYhMX9Tu3i50jis+3YYycEHykf8iArgI3v3o5z7sR7ATDtjjouAkGMQ8MN uToSi5aLuZvijlIqT5fpDjvR4VoXHdRr6p8Fz48ACpSt95i7qulrzzFY4WQw3Y2bxN4B j+zw== 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=ObJfRokD+eXGWjqsY995rJw+PzoXoD3y5Nl6sLxpHCo=; b=U8TIadUINbKzKrvUmPNaJq5h7bGnkero0Hl03PAUcUK6NL+yNI7C5EOlBps2ucY9/G mqLO0LvXdRZOvyc9DYubR1KhdEGHN3Vl9u8nMAXD++0SGARtbqeqEVE53f38scgJINDw dtWKPEyenfBcVSJB9bNjd1LHjJpxLyHhyc8N0puZ6rtXybOoh9xytx4n5GJplihKK9vt KIXEfNKZDRP7TSOaABhdi7KSzxzdCd45Oyy2CfQsEXGaYDfK+dw5D9cIg2sfT5a+FErl rBEbE4WzjBCujDa6iB7XZ09QQv8aScoaztDXZ4A4QubQZgQasC10xo2fBE+y0jI9kpuF vZvQ== X-Gm-Message-State: APjAAAW3ytD462bEn9W6QIqlepRa37/OG2+0hv/zNOGAds4WBpyminr7 YML41lhaHFVtqP2Nv0hq914= X-Google-Smtp-Source: APXvYqzyXQHQG7xExlE6dtU6+8QSBVzNfOKYjftg5BjcslyTCxVUhKthQZVTy+7BlhP7fapLEXx40A== X-Received: by 2002:a1c:4087:: with SMTP id n129mr5301847wma.3.1565282680404; Thu, 08 Aug 2019 09:44:40 -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 g7sm5236913wmg.8.2019.08.08.09.44.39 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 09:44:39 -0700 (PDT) Subject: Re: [GSoC][PATCHl 1/6] rebase -i: add --ignore-whitespace flag To: Rohit Ashiwal , Junio , GIT Mailing List Cc: Thomas , Elijah , Dscho , Martin References: <20190806173638.17510-1-rohit.ashiwal265@gmail.com> <20190806173638.17510-2-rohit.ashiwal265@gmail.com> From: Phillip Wood Message-ID: Date: Thu, 8 Aug 2019 17:44:38 +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: <20190806173638.17510-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 On 06/08/2019 18:36, 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 | 26 ++++++++-- > t/t3422-rebase-incompatible-options.sh | 1 - > t/t3433-rebase-options-compatibility.sh | 65 +++++++++++++++++++++++++ > 4 files changed, 95 insertions(+), 7 deletions(-) > create mode 100755 t/t3433-rebase-options-compatibility.sh > > diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt > index 5e4e927647..85404fea52 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 think it would be better to document the effect of this option rather than the implementation detail. It is confusing at the moment as it talks about 'git merge' but we don't allow this option with merges. > + > --whitespace=