Re: [PATCH v2 7/7] rebase -i: write better reflog messages
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 18, 2013, 20:36 UTC
- Message-ID
- <7v38sf40my.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1371581737-10013-8-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 11 quoted lines
> diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh > index 79e8d3c..f7d0147 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -934,6 +934,21 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' > test L = $(git cat-file commit HEAD | sed -ne \$p) > ' > > +test_expect_success 'rebase -i produces readable reflog' ' > + git reset --hard && > + git branch -f branch1 H &&
Why did this have to change back from branch-reflog-test to branch1 (which I used by mistake in "how about this" patch, but fixed in the version queued on 'pu')?
The reason I did not use 'branch1' in the version I queued on 'pu' is because rr/rebase-sha1-by-string-query, when merged on top of this, makes an assumption on where branch1 is in the test and fliping its tip here will break it.
Have you tested this with combination of that topic before sending it out?