Re: [PATCH 5/6] status: do not depend on flaky reflog messages
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 14, 2013, 22:36 UTC
- Message-ID
- <7v7ghwmi9x.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <CALkWK0==Phbe-9QaOa3jkYMEvxb6F3kypRkk9RbzrLco-HkHKw@mail.gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> Since you have made it clear that you will defend every bit of b397ea
You are misreading me. I am not defending every bit at all.
We both agree that what b397ea4863a1 (status: show more info than "currently not on any branch", 2013-03-13) expects from "git status" during an interrupted "git rebase" is _not_ sacred, especially when we are about to fix what "git rebase" records in the reflog.
I am only saying that the last test the commit adds must be kept unbroken. I am also saying that, even though that commit did not add a test for "detached from" case, we should add something like the attached to protect the behaviour. These two are sacred.
What happens to be shown during a stopped "git rebase" is not.
I have been assuming the "main" thing Duy wanted to do was the last test (and the one below), but was this meant as an improvement for "git status" output during that state? Showing $ONTO certainly makes some sense, and from that point of view, the change we are discussing _will_ be a regression if it just shows a random thing. If you want to avoid regression, the codepath in wt-status.c should compensate for the change to "rebase" so that it checks $dotest/onto and show what is recorded in there.
But in practice, as far as we know other people are working on it in the near-by thread, I do not think this particular regression (if it was) matters that much. At the worst, we can queue that on top of this topic to fix "rebase ; checkout -" and have them graduate at the same time to avoid it.
t/t7512-status-help.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index bf08d4e..e07185e 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -675,6 +675,14 @@ test_expect_success 'status showing detached from a tag' ' nothing to commit (use -u to show untracked files) EOF git status --untracked-files=no >actual && + test_i18ncmp expected actual && + + git reset --hard HEAD^ && + cat >expected <<-\EOF + # HEAD detached from atag + nothing to commit (use -u to show untracked files) + EOF + git status --untracked-files=no >actual && test_i18ncmp expected actual '