From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 22 Aug 2010 06:29:11 +0000 (-0700)
Subject: Merge branch 'mm/rebase-i-exec'
X-Git-Tag: v1.7.3-rc0~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5cba1229d8246da2a6d1d956eeed8227f69e185b;p=git.git

Merge branch 'mm/rebase-i-exec'

* mm/rebase-i-exec:
  git-rebase--interactive.sh: use printf instead of echo to print commit message
  git-rebase--interactive.sh: rework skip_unnecessary_picks
  test-lib: user-friendly alternatives to test [-d|-f|-e]
  rebase -i: add exec command to launch a shell command

Conflicts:
	git-rebase--interactive.sh
	t/t3404-rebase-interactive.sh
---

5cba1229d8246da2a6d1d956eeed8227f69e185b
diff --cc t/t3404-rebase-interactive.sh
index 3af3f603f,56891e6c7..af3b663ae
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -150,10 -211,9 +211,10 @@@ test_expect_success 'abort with error w
  	git rm --cached file1 &&
  	git commit -m "remove file in base" &&
  	test_must_fail git rebase -i master > output 2>&1 &&
 -	grep "Untracked working tree file .file1. would be overwritten" \
 +	grep "The following untracked working tree files would be overwritten by checkout:" \
  		output &&
 +	grep "file1" output &&
- 	! test -d .git/rebase-merge &&
+ 	test_path_is_missing .git/rebase-merge &&
  	git reset --hard HEAD^
  '