From patchwork Mon Aug 17 17:40:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phillip Wood X-Patchwork-Id: 11718991 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A23FD138C for ; Mon, 17 Aug 2020 17:41:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D2042075B for ; Mon, 17 Aug 2020 17:41:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WP6Z/L55" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731113AbgHQRlB (ORCPT ); Mon, 17 Aug 2020 13:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387457AbgHQRkV (ORCPT ); Mon, 17 Aug 2020 13:40:21 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCB58C061345 for ; Mon, 17 Aug 2020 10:40:20 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id r4so15771908wrx.9 for ; Mon, 17 Aug 2020 10:40:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=MTeb+PoiDEm/zoC0VXsRpX7srFH4bPPj+VsfpUpFcw8=; b=WP6Z/L55ZJRIINsVzz+43Kvi9wVsoFHX3TyRV3TkHMlLLiLJcllsB1Qf7dhP7KgwZO RFy0eXICG4bLMhslQizquJbryOUUITyqOoyAkSl+RSZKp6TsmcE9LygeD0xj/RUBcyGL qeexcPmfaO8j50sOYbnyjx79S77NdksZIM83rFLBFl9n8GQuo4jY+MCGE7sUH8gAU89M hezYT5YgEJcmy7nES0CS4HtmUlBWFj0wyBL+6hEzgZCAD/SAb8tyJBKv9k7iaeXB+Oxg IiH8soqLvsgo5UGGfFFJAVjBnF54mX0YnMrDvbYV6r7m1F5BudVCmOt7xkw0DmoNQYc4 dQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=MTeb+PoiDEm/zoC0VXsRpX7srFH4bPPj+VsfpUpFcw8=; b=GZdo/Gh/9/qBcW8z/RofywWXbeiOsN4lRLtNgxST7EzNzG/rbIX0ctSuoAKIrp0aUa bX2QTAb6y2UDmccIAGWzZ2cdjiIlHd1QlH8UotR8WZlLj5RSgsJXrSkmLv6CMRF85hjJ CsJNdp1x38DKrpoKGA/N2ICT6n4BgrkgqJnr0jVwgPt2iTWmsewnvYnTBl/U3/ZMvHCu bu4lZ7fLNJRzS0hDc/LK1te/To1z6bW1KMhWgVL+xbm0D1Zsm9mP7ctL2Gr050VCbO9P FXdZvOK7ypROMoDpjzSUiy+zF/NpGhyKNc4/Wu2lLSVkSUo3d6zu/JvqKj9uCnOdHZ74 xTfA== X-Gm-Message-State: AOAM532W+qNJANNhltRMMoFWYerBQNqGYdttGVXh8maadoFb2Az/WgfO LbSRv46FmHyytsKg9p9+oJQ= X-Google-Smtp-Source: ABdhPJyEf4Ru8bBXEKBD0N1OExX9IRTd1dh1yVjKQLIClyk6W/FVeqd/7E94K53Bi/29ArNVBH/JUg== X-Received: by 2002:adf:fe50:: with SMTP id m16mr17102439wrs.27.1597686019539; Mon, 17 Aug 2020 10:40:19 -0700 (PDT) Received: from localhost.localdomain (192.252.189.80.dyn.plus.net. [80.189.252.192]) by smtp.gmail.com with ESMTPSA id l10sm31252058wru.3.2020.08.17.10.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 10:40:18 -0700 (PDT) From: Phillip Wood To: Johannes Schindelin , Junio C Hamano , Elijah Newren , Rohit Ashiwal , =?utf-8?b?xJBvw6BuIFRy4bqnbiBD?= =?utf-8?b?w7RuZyBEYW5o?= , Alban Gruin , Git Mailing List Subject: [PATCH v8 5/5] rebase: add --reset-author-date Date: Mon, 17 Aug 2020 18:40:04 +0100 Message-Id: <20200817174004.92455-6-phillip.wood123@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200817174004.92455-1-phillip.wood123@gmail.com> References: <20200407141125.30872-1-phillip.wood123@gmail.com> <20200817174004.92455-1-phillip.wood123@gmail.com> Reply-To: Phillip Wood MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Rohit Ashiwal The previous commit introduced --ignore-date flag to rebase -i, but the name is rather vague as it does not say whether the author date or the committer date is ignored. Add an alias to convey the precise purpose. Helped-by: Junio C Hamano Signed-off-by: Rohit Ashiwal --- Documentation/git-rebase.txt | 1 + builtin/rebase.c | 4 +++- t/t3436-rebase-more-options.sh | 34 +++++++++++++++++++++------------- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 79cecd2929..1ee3bb4fac 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -450,6 +450,7 @@ See also INCOMPATIBLE OPTIONS below. date. This option implies `--force-rebase`. --ignore-date:: +--reset-author-date:: Instead of using the author date of the original commit, use the current time as the author date of the rebased commit. This option implies `--force-rebase`. diff --git a/builtin/rebase.c b/builtin/rebase.c index 583ac96fc7..b126fbe940 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1505,8 +1505,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "committer-date-is-author-date", &options.committer_date_is_author_date, N_("make committer date match author date")), - OPT_BOOL(0, "ignore-date", &options.ignore_date, + OPT_BOOL(0, "reset-author-date", &options.ignore_date, N_("ignore author date and use current date")), + OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date, + N_("synonym of --reset-author-date")), OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"), N_("passed to 'git apply'"), 0), OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace, diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh index 0ede2b8900..5b8963272a 100755 --- a/t/t3436-rebase-more-options.sh +++ b/t/t3436-rebase-more-options.sh @@ -117,53 +117,61 @@ test_ctime_is_ignored () { ! grep -v +0000 authortime } -test_expect_success '--ignore-date works with apply backend' ' +test_expect_success '--reset-author-date works with apply backend' ' git commit --amend --date="$GIT_AUTHOR_DATE" && - git rebase --apply --ignore-date HEAD^ && + git rebase --apply --reset-author-date HEAD^ && test_ctime_is_ignored -1 ' -test_expect_success '--ignore-date works with merge backend' ' +test_expect_success '--reset-author-date works with merge backend' ' git commit --amend --date="$GIT_AUTHOR_DATE" && - git rebase --ignore-date -m HEAD^ && + git rebase --reset-author-date -m HEAD^ && test_ctime_is_ignored -1 ' -test_expect_success '--ignore-date works after conflict resolution' ' - test_must_fail git rebase --ignore-date -m \ +test_expect_success '--reset-author-date works after conflict resolution' ' + test_must_fail git rebase --reset-author-date -m \ --onto commit2^^ commit2^ commit2 && echo resolved >foo && git add foo && git rebase --continue && test_ctime_is_ignored -1 ' -test_expect_success '--ignore-date works with rebase -r' ' +test_expect_success '--reset-author-date works with rebase -r' ' git checkout side && git merge --no-ff commit3 && - git rebase -r --root --ignore-date && + git rebase -r --root --reset-author-date && test_ctime_is_ignored ' -test_expect_success '--ignore-date with --committer-date-is-author-date works' ' +test_expect_success '--reset-author-date with --committer-date-is-author-date works' ' test_must_fail git rebase -m --committer-date-is-author-date \ - --ignore-date --onto commit2^^ commit2^ commit3 && + --reset-author-date --onto commit2^^ commit2^ commit3 && git checkout --theirs foo && git add foo && git rebase --continue && test_ctime_is_atime -2 && test_ctime_is_ignored -2 ' -test_expect_success '--ignore-date --committer-date-is-author-date works when forking merge' ' +test_expect_success '--reset-author-date --committer-date-is-author-date works when forking merge' ' GIT_SEQUENCE_EDITOR="echo \"merge -C $(git rev-parse HEAD) commit3\">" \ PATH="./test-bin:$PATH" git rebase -i --strategy=test \ - --ignore-date --committer-date-is-author-date \ - side side && + --reset-author-date \ + --committer-date-is-author-date side side && test_ctime_is_atime -1 && test_ctime_is_ignored -1 ' +test_expect_success '--ignore-date is an alias for --reset-author-date' ' + git commit --amend --date="$GIT_AUTHOR_DATE" && + git rebase --apply --ignore-date HEAD^ && + git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" && + git rebase -m --ignore-date HEAD^ && + test_ctime_is_ignored -2 +' + # This must be the last test in this file test_expect_success '$EDITOR and friends are unchanged' ' test_editor_unchanged