diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:29:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:29:11 -0700 |
| commit | 5cba1229d8246da2a6d1d956eeed8227f69e185b (patch) | |
| tree | 4ebb3bbc82225d157ca2f82474eb93fefe35c20d /t/lib-rebase.sh | |
| parent | Merge branch 'gb/split-cmdline-errmsg' (diff) | |
| parent | git-rebase--interactive.sh: use printf instead of echo to print commit message (diff) | |
| download | tgif-5cba1229d8246da2a6d1d956eeed8227f69e185b.tar.xz | |
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
Diffstat (limited to 't/lib-rebase.sh')
| -rw-r--r-- | t/lib-rebase.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 6aefe27593..6ccf797091 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -47,6 +47,8 @@ for line in $FAKE_LINES; do case $line in squash|fixup|edit|reword) action="$line";; + exec*) + echo "$line" | sed 's/_/ /g' >> "$1";; "#") echo '# comment' >> "$1";; ">") |