t3404 & t3411: undo copy&paste
Rather than copying and pasting, which is prone to lead to fixes missing in one version, move the fake-editor generator to t/t3404/. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8712b3cdb0
commit
29a03348a3
36
t/lib-rebase.sh
Normal file
36
t/lib-rebase.sh
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set_fake_editor () {
|
||||||
|
echo "#!$SHELL_PATH" >fake-editor.sh
|
||||||
|
cat >> fake-editor.sh <<\EOF
|
||||||
|
case "$1" in
|
||||||
|
*/COMMIT_EDITMSG)
|
||||||
|
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
|
||||||
|
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
|
||||||
|
exit
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
test -z "$EXPECT_COUNT" ||
|
||||||
|
test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
|
||||||
|
exit
|
||||||
|
test -z "$FAKE_LINES" && exit
|
||||||
|
grep -v '^#' < "$1" > "$1".tmp
|
||||||
|
rm -f "$1"
|
||||||
|
cat "$1".tmp
|
||||||
|
action=pick
|
||||||
|
for line in $FAKE_LINES; do
|
||||||
|
case $line in
|
||||||
|
squash|edit)
|
||||||
|
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
|
||||||
|
EOF
|
||||||
|
|
||||||
|
test_set_editor "$(pwd)/fake-editor.sh"
|
||||||
|
chmod a+x fake-editor.sh
|
||||||
|
}
|
@ -10,6 +10,10 @@ that the result still makes sense.
|
|||||||
'
|
'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
|
. ../lib-rebase.sh
|
||||||
|
|
||||||
|
set_fake_editor
|
||||||
|
|
||||||
# set up two branches like this:
|
# set up two branches like this:
|
||||||
#
|
#
|
||||||
# A - B - C - D - E
|
# A - B - C - D - E
|
||||||
@ -61,39 +65,6 @@ test_expect_success 'setup' '
|
|||||||
git tag I
|
git tag I
|
||||||
'
|
'
|
||||||
|
|
||||||
echo "#!$SHELL_PATH" >fake-editor.sh
|
|
||||||
cat >> fake-editor.sh <<\EOF
|
|
||||||
case "$1" in
|
|
||||||
*/COMMIT_EDITMSG)
|
|
||||||
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
|
|
||||||
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
test -z "$EXPECT_COUNT" ||
|
|
||||||
test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
|
|
||||||
exit
|
|
||||||
test -z "$FAKE_LINES" && exit
|
|
||||||
grep -v '^#' < "$1" > "$1".tmp
|
|
||||||
rm -f "$1"
|
|
||||||
cat "$1".tmp
|
|
||||||
action=pick
|
|
||||||
for line in $FAKE_LINES; do
|
|
||||||
case $line in
|
|
||||||
squash|edit)
|
|
||||||
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
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_set_editor "$(pwd)/fake-editor.sh"
|
|
||||||
chmod a+x fake-editor.sh
|
|
||||||
|
|
||||||
test_expect_success 'no changes are a nop' '
|
test_expect_success 'no changes are a nop' '
|
||||||
git rebase -i F &&
|
git rebase -i F &&
|
||||||
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
|
test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
|
||||||
|
@ -5,44 +5,14 @@
|
|||||||
|
|
||||||
test_description='git rebase preserve merges
|
test_description='git rebase preserve merges
|
||||||
|
|
||||||
This test runs git rebase with and tries to squash a commit from after a merge
|
This test runs git rebase with -p and tries to squash a commit from after
|
||||||
to before the merge.
|
a merge to before the merge.
|
||||||
'
|
'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
# Copy/paste from t3404-rebase-interactive.sh
|
. ../lib-rebase.sh
|
||||||
echo "#!$SHELL_PATH" >fake-editor.sh
|
|
||||||
cat >> fake-editor.sh <<\EOF
|
|
||||||
case "$1" in
|
|
||||||
*/COMMIT_EDITMSG)
|
|
||||||
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
|
|
||||||
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
|
|
||||||
exit
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
test -z "$EXPECT_COUNT" ||
|
|
||||||
test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
|
|
||||||
exit
|
|
||||||
test -z "$FAKE_LINES" && exit
|
|
||||||
grep -v '^#' < "$1" > "$1".tmp
|
|
||||||
rm -f "$1"
|
|
||||||
cat "$1".tmp
|
|
||||||
action=pick
|
|
||||||
for line in $FAKE_LINES; do
|
|
||||||
case $line in
|
|
||||||
squash|edit)
|
|
||||||
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
|
|
||||||
EOF
|
|
||||||
|
|
||||||
test_set_editor "$(pwd)/fake-editor.sh"
|
set_fake_editor
|
||||||
chmod a+x fake-editor.sh
|
|
||||||
|
|
||||||
# set up two branches like this:
|
# set up two branches like this:
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user