Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Junio C Hamano wrote: I actually tried to reorder the patches and they seem to work OK as expected. And I think it makes sense to order them the way I've been suggesting, so I'll tentatively queue the result of reordering on 'rr/rebase-checkout-reflog' and push it out as a part of 'pu'.

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Ramkumar Ramachandra wrote: Thanks for the reorder and commit message tweaks. I'm working on the series you put up on `pu` now. That said, I do not agree with one of your commit message updates: checkout: respect GIT_REFLOG_ACTION GIT_REFLOG_ACTION is an environment variable

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Junio C Hamano wrote: diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a58406d..c175ef1 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' '

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a58406d..c175ef1 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -934,6 +934,21 @@ test_expect_success

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Junio C Hamano wrote: Apply the test change without the do not leak part in the fix-up (queued as a single SQUASH??? commit on 'pu') to what you posted earlier and see how it breaks. --- expect 2013-06-18 16:09:21.0 + +++ actual 2013-06-18 16:09:21.0

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Junio C Hamano gits...@pobox.com writes: In other words, the order I was anticipating to see after the discussion (this is different from saying A series that is not ordered like this is unacceptable) was: wt-status: remove unused field in grab_1st_switch_cbdata This is an unrelated

[PATCH v2 0/6] Fix checkout-dash to work with rebase

So after extensive discussions with Junio, I have updated [5/6] to special-case rebase and rebase -i instead of dropping the HEAD detached from message altogether. Also, [1/6] includes two more tests, as suggested by Junio. Junio: The message is now the constant rebase in progress; onto $ONTO.

Re: [PATCH v2 0/6] Fix checkout-dash to work with rebase

Ramkumar Ramachandra artag...@gmail.com writes: So after extensive discussions with Junio, I have updated [5/6] to special-case rebase and rebase -i instead of dropping the HEAD detached from message altogether. Also, [1/6] includes two more tests, as suggested by Junio. Junio: The message