From: Michael Haggerty Date: Tue, 12 Jan 2010 15:38:34 +0000 (+0100) Subject: lib-rebase: Provide clearer debugging info about what the editor did X-Git-Tag: v1.7.0-rc0~70^2~2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f64b4856243a9ea9445068a0989c71a8915c3862;p=git.git lib-rebase: Provide clearer debugging info about what the editor did (For testing "rebase -i"): Output the "rebase -i" command script before and after the edits, to make it clearer what the editor did. Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano --- diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index f4dda02b5..0fce5952c 100644 --- a/t/lib-rebase.sh +++ b/t/lib-rebase.sh @@ -29,6 +29,7 @@ test -z "$EXPECT_COUNT" || test -z "$FAKE_LINES" && exit grep -v '^#' < "$1" > "$1".tmp rm -f "$1" +echo 'rebase -i script before editing:' cat "$1".tmp action=pick for line in $FAKE_LINES; do @@ -36,12 +37,12 @@ for line in $FAKE_LINES; do squash|fixup|edit|reword) action="$line";; *) - echo sed -n "${line}s/^pick/$action/p" - sed -n "${line}p" < "$1".tmp sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1" action=pick;; esac done +echo 'rebase -i script after editing:' +cat "$1" EOF test_set_editor "$(pwd)/fake-editor.sh"