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>
Subject: [PATCH v2 0/4] Fix ORIG_HEAD behavior of the built-in rebase
Date: Sun, 03 Mar 2019 09:11:52 -0800 (PST) [thread overview]
Message-ID: <pull.153.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.153.git.gitgitgadget@gmail.com>
It was reported by Nazri Ramliy that ORIG_HEAD was set incorrectly again,
this time caused by the shortcut to call git am directly, without detouring
to a Unix shell script.
Patch 2/4 might look like something completely unrelated, but without it,
the update to HEAD might use an incorrect reflog message.
Patch 1/4 is more a "while at it" patch; while looking which code paths
might need to update ORIG_HEAD, I noticed that this reset_head() call did
unnecessary work.
Changes since v1:
* Reworded the unclear commit message of patch 1/4.
Johannes Schindelin (4):
built-in rebase: no need to check out `onto` twice
built-in rebase: use the correct reflog when switching branches
built-in rebase: demonstrate that ORIG_HEAD is not set correctly
built-in rebase: set ORIG_HEAD just once, before the rebase
builtin/rebase.c | 37 +++++++++++++++++++++----------------
t/t3400-rebase.sh | 8 ++++++++
2 files changed, 29 insertions(+), 16 deletions(-)
base-commit: 21853626eac565dd42572d90724b29863f61eb3b
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-153%2Fdscho%2Frebase-am-and-orig-head-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-153/dscho/rebase-am-and-orig-head-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/153
Range-diff vs v1:
1: 2d99429387 ! 1: 59c3266ed5 built-in rebase: no need to check out `onto` twice
@@ -4,12 +4,21 @@
In the case that the rebase boils down to a fast-forward, the built-in
rebase reset the working tree twice: once to start the rebase at `onto`,
- then realizing that the original HEAD was an ancestor, `reset_head()`
- was called to update the original ref and to point HEAD back to it.
+ then realizing that the original (pre-rebase) HEAD was an ancestor and
+ we basically already fast-forwarded to the post-rebase HEAD,
+ `reset_head()` was called to update the original ref and to point HEAD
+ back to it.
That second `reset_head()` call does not need to touch the working tree,
- though, as it does not change the actual tip commit. So let's avoid that
- unnecessary work.
+ though, as it does not change the actual tip commit (and therefore the
+ working tree should stay unchanged anyway): only the ref needs to be
+ updated (because the rebase detached the HEAD, and we want to go back to
+ the branch on which the rebase was started).
+
+ But that second `reset_head()` was called without the flag to leave the
+ working tree alone (the reason: when that call was introduced, that flag
+ was not yet even thought of). Let's avoid that unnecessary work by
+ passing that flag.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2: b92d76065d = 2: 67e41c032a built-in rebase: use the correct reflog when switching branches
3: 1bc3cbad26 = 3: 17737998f4 built-in rebase: demonstrate that ORIG_HEAD is not set correctly
4: 1786c172ef = 4: 7891c05f51 built-in rebase: set ORIG_HEAD just once, before the rebase
--
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 ` Johannes Schindelin via GitGitGadget [this message]
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 3/4] built-in rebase: demonstrate that ORIG_HEAD is not set correctly 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 ` [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=pull.153.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=ayiehere@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).