Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit

From: Junio C Hamano <hidden>
Date: 2016-06-15 23:05:28

Matthieu Moy [off-list ref] writes:
Remi Galan Alfonso [off-list ref] writes:
quoted
I think that the indentation on its own is enough to avoid confusion
quoted
test_rebase_end () {
	test_when_finished "git checkout master &&
		git branch -D $1 &&
		test_might_fail git rebase --abort" &&
	git checkout -b $1 master
}
but your idea is fine as well, so I'm ok with either way.
Read too quickly, it looks like a mis-indentation (I could laugh at Eric
here, but I made the same confusion when reading the code at first). By
"avoid the confusion" I mean "make it clear it's not a mis-indentation".
Yes, that stray " fooled me as well.  If it were following your
suggestion in the earlier message on this thread, i.e.

	test_when_finished "
		... &&
		...
	" &&
	git checkout

I wouldn't have to waste time commenting on it ;-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help