From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Nazri Ramliy <ayiehere@gmail.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 3/4] built-in rebase: demonstrate that ORIG_HEAD is not set correctly
Date: Sun, 03 Mar 2019 09:11:54 -0800 (PST) [thread overview]
Message-ID: <17737998f45ed8b4e38fa58ff82309231230fc81.1551633112.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.153.v2.git.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
The ORIG_HEAD pseudo ref is supposed to refer to the original,
pre-rebase state after a successful rebase. Let's add a regression test
to prove that this regressed: With GIT_TEST_REBASE_USE_BUILTIN=false,
this test case passes, with GIT_TEST_REBASE_USE_BUILTIN=true (or unset),
it fails.
Reported by Nazri Ramliy.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
t/t3400-rebase.sh | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 3e73f7584c..7e8d5bb200 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -59,6 +59,14 @@ test_expect_success 'rebase against master' '
git rebase master
'
+test_expect_failure 'rebase sets ORIG_HEAD to pre-rebase state' '
+ git checkout -b orig-head topic &&
+ pre="$(git rev-parse --verify HEAD)" &&
+ git rebase master &&
+ test_cmp_rev "$pre" ORIG_HEAD &&
+ ! test_cmp_rev "$pre" HEAD
+'
+
test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
test_when_finished "git branch -D torebase" &&
git checkout -b torebase my-topic-branch^ &&
--
gitgitgadget
next prev parent reply other threads:[~2019-03-03 17:11 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 15:27 [PATCH 0/4] Fix ORIG_HEAD behavior of the built-in rebase Johannes Schindelin via GitGitGadget
2019-02-28 15:27 ` [PATCH 1/4] built-in rebase: no need to check out `onto` twice Johannes Schindelin via GitGitGadget
2019-02-28 20:55 ` Phillip Wood
2019-03-01 13:19 ` Johannes Schindelin
2019-03-01 15:00 ` Phillip Wood
2019-03-03 1:35 ` Junio C Hamano
2019-03-03 17:09 ` Johannes Schindelin
2019-03-03 19:11 ` Phillip Wood
2019-02-28 15:27 ` [PATCH 2/4] built-in rebase: use the correct reflog when switching branches Johannes Schindelin via GitGitGadget
2019-02-28 15:27 ` [PATCH 3/4] built-in rebase: demonstrate that ORIG_HEAD is not set correctly Johannes Schindelin via GitGitGadget
2019-02-28 15:27 ` [PATCH 4/4] built-in rebase: set ORIG_HEAD just once, before the rebase Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 0/4] Fix ORIG_HEAD behavior of the built-in rebase Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 1/4] built-in rebase: no need to check out `onto` twice Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` [PATCH v2 2/4] built-in rebase: use the correct reflog when switching branches Johannes Schindelin via GitGitGadget
2019-03-03 17:11 ` Johannes Schindelin via GitGitGadget [this message]
2019-03-03 17:11 ` [PATCH v2 4/4] built-in rebase: set ORIG_HEAD just once, before the rebase Johannes Schindelin via GitGitGadget
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=17737998f45ed8b4e38fa58ff82309231230fc81.1551633112.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood123@gmail.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).