[PATCHv2 1/3] lib-rebase: Provide clearer debugging info about what the editor did
- From
Michael Haggerty <mhagger@alum.mit.edu>
- Date
- Jan 12, 2010, 15:38 UTC
- Message-ID
- <a6ef19853c00263c2875026cb438ce46d3fcf950.1263310175.git.mhagger@alum.mit.edu>
- In-Reply-To
- <7vr5pw3pwp.fsf@alter.siamese.dyndns.org>
(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 <mhagger@alum.mit.edu> --- t/lib-rebase.sh | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index f4dda02..0fce595 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"
-- 1.6.6.140.ga53ad