[PATCH 3/3] doc: merge-tree: use || directly

From

Kristoffer Haugsbakk <code@khaugsbakk.name>

Date

Oct 7, 2024, 11:10 UTC

Message-ID

<4057d6386125e51fd934f92abd11c62a9d24a832.1728298931.git.code@khaugsbakk.name>

In-Reply-To

<cover.1728298931.git.code@khaugsbakk.name>

From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>

From: Kristoffer Haugsbakk <code@khaugsbakk.name>

Also use `echo` and `exit` since `die` is not defined.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
---
 Documentation/git-merge-tree.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index 10f8ac7f80a..46091da022d 100644
--- a/Documentation/git-merge-tree.txt
+++ b/Documentation/git-merge-tree.txt
@@ -211,8 +211,10 @@ linkgit:git-commit-tree[1], linkgit:git-write-tree[1],
 linkgit:git-update-ref[1], and linkgit:git-mktag[1].  Thus, it can be
 used as a part of a series of steps such as:
 
-       newtree=$(git merge-tree --write-tree $branch1 $branch2)
-       test $? -eq 0 || die "There were conflicts..."
+       newtree=$(git merge-tree --write-tree $branch1 $branch2) || {
+           echo "There were conflicts..." 1>&2
+           exit 1
+       }
        newcommit=$(git commit-tree $newtree -mMerge -p $branch1 -p $branch2)
        git update-ref $branch1 $newcommit
 

-- 
2.46.1.641.g54e7913fcb6