Re: [RFC PATCH 11/35] update: add --merge mode

Ævar Arnfjörð Bjarmason wrote:

On Mon, Jul 05 2021, Felipe Contreras wrote:

quoted

--- a/t/t5563-update.sh
+++ b/t/t5563-update.sh

@@ -42,4 +42,19 @@ test_expect_success 'non-fast-forward update' '
 	)
 '
 
+test_expect_success 'git update non-fast-forward with merge' '
+	test_when_finished "rm -rf test" &&
+	(
+	git clone . test &&
+	cd test &&
+	git checkout -b other master^ &&
+	>new &&

We usually indent the subshell...

All right.

quoted

+	git add new &&
+	git commit -m new &&

And if we can use test_commit, less verbose.

OK. Sure.

FTR. These tests come from 2013, they don't fit my current style and I
wanted to rewrite them completely since there's a lot of duplicated
code. But I thought: what the hell, they work. Plus there's only so much
time I'm willing to spend on an RFC v1 of this series (which probably
won't be merged anyway).

Cheers.

-- 
Felipe Contreras