mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
status: do not depend on rebase reflog messages
b397ea4 (status: show more info than "currently not on any branch",
2013-03-13) attempted to make the output of 'git status' richer in
the case of a detached HEAD. Before this patch, with a detached
HEAD, we saw:
$ git status
# Not currently on any branch.
But after the patch, we see:
$ git checkout v1.8.2
$ git status
# HEAD detached at v1.8.2.
It works by digging the reflog for the most recent message of the
form "checkout: moving from xxxx to yyyy". It then asserts that
HEAD and "yyyy" are the same, and displays this message. When they
aren't equal, it displays:
$ git status
# HEAD detached from fe11db.
so that the user can see where the HEAD was first detached.
In case of a rebase [-i] operation in progress, this message depends
on the implementation of rebase writing "checkout: " messages to the
reflog, but that is an implementation detail of "rebase". To remove
this dependency so that rebase can be updated to write better reflog
messages, replace this "HEAD detached from" message with:
# rebase in progress; onto $ONTO
Changes to the commit object name in the expected output for some of
the tests shows that what the test expected "status" to show during
"rebase -i" was not consistent with the output during a vanilla
"rebase", which showed on top of what commit the series is being
replayed. Now we consistently expect something meaningful to the
end user.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>This commit is contained in:
Ramkumar Ramachandra
Junio C Hamano
parent
89f2fea49a
commit
ec50631064
@ -77,7 +77,7 @@ test_expect_success 'status when rebase in progress before resolving conflicts'
|
||||
ONTO=$(git rev-parse --short HEAD^^) &&
|
||||
test_must_fail git rebase HEAD^ --onto HEAD^^ &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
|
||||
# (fix conflicts and then run "git rebase --continue")
|
||||
# (use "git rebase --skip" to skip this patch)
|
||||
@ -104,7 +104,7 @@ test_expect_success 'status when rebase in progress before rebase --continue' '
|
||||
echo three >main.txt &&
|
||||
git add main.txt &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
|
||||
# (all conflicts fixed: run "git rebase --continue")
|
||||
#
|
||||
@ -136,7 +136,7 @@ test_expect_success 'status during rebase -i when conflicts unresolved' '
|
||||
ONTO=$(git rev-parse --short rebase_i_conflicts) &&
|
||||
test_must_fail git rebase -i rebase_i_conflicts &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
|
||||
# (fix conflicts and then run "git rebase --continue")
|
||||
# (use "git rebase --skip" to skip this patch)
|
||||
@ -162,7 +162,7 @@ test_expect_success 'status during rebase -i after resolving conflicts' '
|
||||
test_must_fail git rebase -i rebase_i_conflicts &&
|
||||
git add main.txt &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
|
||||
# (all conflicts fixed: run "git rebase --continue")
|
||||
#
|
||||
@ -188,10 +188,9 @@ test_expect_success 'status when rebasing -i in edit mode' '
|
||||
export FAKE_LINES &&
|
||||
test_when_finished "git rebase --abort" &&
|
||||
ONTO=$(git rev-parse --short HEAD~2) &&
|
||||
TGT=$(git rev-parse --short two_rebase_i) &&
|
||||
git rebase -i HEAD~2 &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $TGT
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -216,9 +215,8 @@ test_expect_success 'status when splitting a commit' '
|
||||
ONTO=$(git rev-parse --short HEAD~3) &&
|
||||
git rebase -i HEAD~3 &&
|
||||
git reset HEAD^ &&
|
||||
TGT=$(git rev-parse --short HEAD) &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $TGT
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently splitting a commit while rebasing branch '\''split_commit'\'' on '\''$ONTO'\''.
|
||||
# (Once your working directory is clean, run "git rebase --continue")
|
||||
#
|
||||
@ -246,11 +244,10 @@ test_expect_success 'status after editing the last commit with --amend during a
|
||||
export FAKE_LINES &&
|
||||
test_when_finished "git rebase --abort" &&
|
||||
ONTO=$(git rev-parse --short HEAD~3) &&
|
||||
TGT=$(git rev-parse --short three_amend) &&
|
||||
git rebase -i HEAD~3 &&
|
||||
git commit --amend -m "foo" &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $TGT
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''amend_last'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -280,7 +277,7 @@ test_expect_success 'status: (continue first edit) second edit' '
|
||||
git rebase -i HEAD~3 &&
|
||||
git rebase --continue &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -302,7 +299,7 @@ test_expect_success 'status: (continue first edit) second edit and split' '
|
||||
git rebase --continue &&
|
||||
git reset HEAD^ &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (Once your working directory is clean, run "git rebase --continue")
|
||||
#
|
||||
@ -329,7 +326,7 @@ test_expect_success 'status: (continue first edit) second edit and amend' '
|
||||
git rebase --continue &&
|
||||
git commit --amend -m "foo" &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -351,7 +348,7 @@ test_expect_success 'status: (amend first edit) second edit' '
|
||||
git commit --amend -m "a" &&
|
||||
git rebase --continue &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -374,7 +371,7 @@ test_expect_success 'status: (amend first edit) second edit and split' '
|
||||
git rebase --continue &&
|
||||
git reset HEAD^ &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (Once your working directory is clean, run "git rebase --continue")
|
||||
#
|
||||
@ -402,7 +399,7 @@ test_expect_success 'status: (amend first edit) second edit and amend' '
|
||||
git rebase --continue &&
|
||||
git commit --amend -m "d" &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -426,7 +423,7 @@ test_expect_success 'status: (split first edit) second edit' '
|
||||
git commit -m "e" &&
|
||||
git rebase --continue &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -451,7 +448,7 @@ test_expect_success 'status: (split first edit) second edit and split' '
|
||||
git rebase --continue &&
|
||||
git reset HEAD^ &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (Once your working directory is clean, run "git rebase --continue")
|
||||
#
|
||||
@ -481,7 +478,7 @@ test_expect_success 'status: (split first edit) second edit and amend' '
|
||||
git rebase --continue &&
|
||||
git commit --amend -m "h" &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached from $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
|
||||
# (use "git commit --amend" to amend the current commit)
|
||||
# (use "git rebase --continue" once you are satisfied with your changes)
|
||||
@ -601,7 +598,7 @@ test_expect_success 'status when rebase conflicts with statushints disabled' '
|
||||
ONTO=$(git rev-parse --short HEAD^^) &&
|
||||
test_must_fail git rebase HEAD^ --onto HEAD^^ &&
|
||||
cat >expected <<-EOF &&
|
||||
# HEAD detached at $ONTO
|
||||
# rebase in progress; onto $ONTO
|
||||
# You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''.
|
||||
#
|
||||
# Unmerged paths:
|
||||
|
||||
@ -1174,7 +1174,10 @@ void wt_status_print(struct wt_status *s)
|
||||
branch_name += 11;
|
||||
else if (!strcmp(branch_name, "HEAD")) {
|
||||
branch_status_color = color(WT_STATUS_NOBRANCH, s);
|
||||
if (state.detached_from) {
|
||||
if (state.rebase_in_progress || state.rebase_interactive_in_progress) {
|
||||
on_what = _("rebase in progress; onto ");
|
||||
branch_name = state.onto;
|
||||
} else if (state.detached_from) {
|
||||
unsigned char sha1[20];
|
||||
branch_name = state.detached_from;
|
||||
if (!get_sha1("HEAD", sha1) &&
|
||||
|
||||
Loading…
Reference in New Issue
Block a user