From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Mar 2015 18:23:17 +0000 (-0700)
Subject: Merge branch 'es/rebase-i-count-todo' into maint
X-Git-Tag: v2.3.4~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d?hp=--cc

Merge branch 'es/rebase-i-count-todo' into maint

"git rebase -i" recently started to include the number of
commits in the insn sheet to be processed, but on a platform
that prepends leading whitespaces to "wc -l" output, the numbers
are shown with extra whitespaces that aren't necessary.

* es/rebase-i-count-todo:
rebase-interactive: re-word "item count" comment
rebase-interactive: suppress whitespace preceding item count
---

f63ed085e20da82a8b7b49d90c61d0eb1b2ed19d
diff --cc t/t3404-rebase-interactive.sh
index a31f7e0430,5dc2caf3c5..034eb35cdf
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -1039,11 -1039,13 +1039,20 @@@ test_expect_success 'short SHA-1 collid
  	)
  '
  
 +test_expect_success 'respect core.abbrev' '
 +	git config core.abbrev 12 &&
 +	set_cat_todo_editor &&
 +	test_must_fail git rebase -i HEAD~4 >todo-list &&
 +	test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
 +'
 +
+ test_expect_success 'todo count' '
+ 	write_script dump-raw.sh <<-\EOF &&
+ 		cat "$1"
+ 	EOF
+ 	test_set_editor "$(pwd)/dump-raw.sh" &&
+ 	git rebase -i HEAD~4 >actual &&
+ 	grep "^# Rebase ..* onto ..* ([0-9]" actual
+ '
+ 
  test_done