From: Clemens Buchacher <clemens.buchacher@intel.com>
To: git@vger.kernel.org
Cc: Andrew Wong <andrew.kw.w@gmail.com>, Jorge Nunes <jorge.nunes@intel.com>
Subject: [PATCH] rebase: return non-zero error code if format-patch fails
Date: Thu, 2 Jul 2015 11:11:33 +0200 [thread overview]
Message-ID: <20150702091133.GA13353@musxeris015.imu.intel.com> (raw)
Since e481af06 (rebase: Handle cases where format-patch fails) we
notice if format-patch fails and return immediately from
git-rebase--am. We save the return value with ret=$?, but then we
return $?, which is usually zero in this case.
Fix this by returning $ret instead.
Cc: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com>
Reviewed-by: Jorge Nunes <jorge.nunes@intel.com>
---
git-rebase--am.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index f923732..9ae898b 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -78,7 +78,7 @@ else
As a result, git cannot rebase them.
EOF
- return $?
+ return $ret
fi
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
--
1.9.4
next reply other threads:[~2015-07-02 9:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 9:11 Clemens Buchacher [this message]
2015-07-03 17:52 ` [PATCH] rebase: return non-zero error code if format-patch fails Junio C Hamano
2015-07-06 8:53 ` Clemens Buchacher
2015-07-06 17: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=20150702091133.GA13353@musxeris015.imu.intel.com \
--to=clemens.buchacher@intel.com \
--cc=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
--cc=jorge.nunes@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).