From: Junio C Hamano <gitster@pobox.com>
To: Kristoffer Haugsbakk <code@khaugsbakk.name>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>,
newren@gmail.com
Subject: Re: [PATCH v2 2/2] doc: merge-tree: use || directly
Date: Tue, 08 Oct 2024 13:44:21 -0700 [thread overview]
Message-ID: <xmqqjzeiz5ne.fsf@gitster.g> (raw)
In-Reply-To: <13e0f3bed5dd894ee692c672b301697e0a909e04.1728413450.git.code@khaugsbakk.name> (Kristoffer Haugsbakk's message of "Tue, 8 Oct 2024 21:06:06 +0200")
Kristoffer Haugsbakk <code@khaugsbakk.name> writes:
> - 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
> + }
Makes sense. Was there a particular reason why these two patches
had to be done in two separate steps?
Looking good otherwise. Thanks.
next prev parent reply other threads:[~2024-10-08 20:44 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 11:10 [PATCH 0/3] doc: merge-tree: improve the script example Kristoffer Haugsbakk
2024-10-07 11:10 ` [PATCH 1/3] doc: merge-tree: provide a commit message Kristoffer Haugsbakk
2024-10-07 12:02 ` Kristoffer Haugsbakk
2024-10-07 15:17 ` Elijah Newren
2024-10-07 15:23 ` Kristoffer Haugsbakk
2024-10-07 11:10 ` [PATCH 2/3] doc: merge-tree: use lower-case variables Kristoffer Haugsbakk
2024-10-07 14:58 ` Phillip Wood
2024-10-07 15:22 ` Elijah Newren
2024-10-07 11:10 ` [PATCH 3/3] doc: merge-tree: use || directly Kristoffer Haugsbakk
2024-10-07 15:24 ` Elijah Newren
2024-10-07 15:44 ` Kristoffer Haugsbakk
2024-10-07 14:59 ` [PATCH 0/3] doc: merge-tree: improve the script example Phillip Wood
2024-10-07 15:00 ` Kristoffer Haugsbakk
2024-10-08 19:06 ` [PATCH v2 0/2] " Kristoffer Haugsbakk
2024-10-08 19:06 ` [PATCH v2 1/2] doc: merge-tree: provide a commit message Kristoffer Haugsbakk
2024-10-08 20:42 ` Junio C Hamano
2024-10-08 20:44 ` Kristoffer Haugsbakk
2024-10-09 16:35 ` Kristoffer Haugsbakk
2024-10-09 17:38 ` Junio C Hamano
2024-10-09 16:58 ` Andreas Schwab
2024-10-08 19:06 ` [PATCH v2 2/2] doc: merge-tree: use || directly Kristoffer Haugsbakk
2024-10-08 20:44 ` Junio C Hamano [this message]
2024-10-08 20:48 ` Kristoffer Haugsbakk
2024-10-09 16:53 ` [PATCH v3 0/1] doc: merge-tree: improve the script example Kristoffer Haugsbakk
2024-10-09 16:53 ` [PATCH v3 1/1] doc: merge-tree: improve example script Kristoffer Haugsbakk
2024-10-09 20:50 ` [PATCH v3 0/1] doc: merge-tree: improve the script example Elijah Newren
2024-10-10 0:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqjzeiz5ne.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=code@khaugsbakk.name \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.