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=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 C5EB41F461 for ; Tue, 20 Aug 2019 03:45:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728777AbfHTDpr (ORCPT ); Mon, 19 Aug 2019 23:45:47 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:38597 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728627AbfHTDpr (ORCPT ); Mon, 19 Aug 2019 23:45:47 -0400 Received: by mail-pg1-f194.google.com with SMTP id e11so2383895pga.5 for ; Mon, 19 Aug 2019 20:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NWjYGQw92Jvue0cTHJQvX41JImormDAsXdeExIl4mKA=; b=hEszwf32Fc6VlvQfP68AMY7CoTdt82nZKVIgsC/a00l7uZeVQAZguE3OaAHO46NiVD vkQrbqAfvfT2dSLBjYd4FyUasvsFA2IbuRzROSGZHhBdJafjKopiT3r/EjN3allPSCL8 riw/3eI0a+VY0oL84qrKbYLLGPiK25nSwDfFN5oz+aiZer868N0X9pqapWj9U6/XOlDr Ost2ntMcRJz10wEWfPrlE8FcZrG+oTI5+B+Y8NgLsHrB4iz/6i9BkqaDJJwHbJquMp6V uSXmQtdisfz+RT8GDoakF9QpaV4G87GtaJyLjDZs3kGOMcvIQfVr/jLsuDuoKC5kVBj2 xTrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NWjYGQw92Jvue0cTHJQvX41JImormDAsXdeExIl4mKA=; b=FTBXtVonXBkpcPVqjtwcmDtLhoTd3mLTpLIWrUupvNZ1WqYSBYbL2UMOQirjubDH9M uBnRj9oC10zip1+0mS0p8OYMOY6C0M9crR43gQKWbgMoSZsmspcGWmv2P7e9AxQxGiGb WN9Iy/+ApdrFh2JYRcp2Hxr+kFoA5PpnlLmKzW0H2NG8T5Px6+QOVOJBow9hFCyODOTL RBV4AJpKPY6VRCR0HA7U8A4KJqdXOW5ksc55uanGmwkMbWHGuWM9wKgjSYhZcdkN2XlV WtOgXJh3/CXQ7CH/2Z/RN5qGX/h4YmfPyfl3T11CVcmbnq5qN07aSCSZcL09nm/X+may 3NBg== X-Gm-Message-State: APjAAAUDONtOQ6POPtVHjj4ajHNDwoKHEK9woZNA1c+u3o/wkoYahZzz UwikhD9BbCqW/K7KZwG9XfY= X-Google-Smtp-Source: APXvYqxTwuJW4dNM4pJ0T+VO8wU+Z39jAzAY6n7exLZvO0VLJsGEOoOadEa3PSy4p8hgZ9Fe4zOjUg== X-Received: by 2002:a17:90a:8b98:: with SMTP id z24mr24289230pjn.77.1566272745574; Mon, 19 Aug 2019 20:45:45 -0700 (PDT) Received: from ar135.iitr.ac.in ([103.37.200.227]) by smtp.gmail.com with ESMTPSA id v67sm30115686pfb.45.2019.08.19.20.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Aug 2019 20:45:44 -0700 (PDT) From: Rohit Ashiwal To: rohit.ashiwal265@gmail.com Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, gitster@pobox.com, martin.agren@gmail.com, newren@gmail.com, phillip.wood123@gmail.com, t.gummerer@gmail.com Subject: [PATCH v3 0/6] rebase -i: support more options Date: Tue, 20 Aug 2019 09:15:29 +0530 Message-Id: <20190820034536.13071-1-rohit.ashiwal265@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190806173638.17510-1-rohit.ashiwal265@gmail.com> References: <20190806173638.17510-1-rohit.ashiwal265@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org I've tries to incorporated all the suggestions. Some points: - According to v2.0.0's git-am.sh, ignore-date should override committer-date-is-author-date. Ergo, we are not barfing out when both flags are provided. - Should the 'const' qualifier be removed[2]? Since it is leaving a false impression that author should not be free()'d. [1]: git show v2.0.0:git-am.sh [2]: https://github.com/git/git/blob/v2.23.0/sequencer.c#L959 Rohit Ashiwal (6): rebase -i: add --ignore-whitespace flag sequencer: add NULL checks under read_author_script rebase -i: support --committer-date-is-author-date sequencer: rename amend_author to author_to_rename rebase -i: support --ignore-date rebase: add --reset-author-date Documentation/git-rebase.txt | 26 +++-- builtin/rebase.c | 53 +++++++--- sequencer.c | 135 ++++++++++++++++++++++-- sequencer.h | 2 + t/t3422-rebase-incompatible-options.sh | 2 - t/t3433-rebase-options-compatibility.sh | 100 ++++++++++++++++++ 6 files changed, 289 insertions(+), 29 deletions(-) create mode 100755 t/t3433-rebase-options-compatibility.sh Range-diff: 1: 4cd0aa3084 ! 1: e82ed8cad5 rebase -i: add --ignore-whitespace flag @@ -19,10 +19,13 @@ 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. ++ Behaves differently depending on which backend is selected. +++ ++'am' backend: When applying a patch, ignore changes in whitespace in ++context lines if necessary. +++ ++'interactive' backend: Treat lines with only whitespace changes as ++unchanged for the sake of a three-way merge. + --whitespace=