From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash
Date: Fri, 10 May 2013 08:29:48 -0700 [thread overview]
Message-ID: <7v38tu4zv7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1368196005-5354-9-git-send-email-artagnon@gmail.com> (Ramkumar Ramachandra's message of "Fri, 10 May 2013 19:56:45 +0530")
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> +finish_rebase () {
> + if test -f "$state_dir/autostash"
> + then
> + stash_sha1=$(cat "$state_dir/autostash")
> + if git stash apply $stash_sha1 2>&1 >/dev/null
> + then
> + echo "Applied autostash"
> + else
> + ref_stash=refs/stash &&
> + : >>"$GIT_DIR/logs/$ref_stash" &&
> + git update-ref -m "autostash" $ref_stash $stash_sha1 \
> + || die "$(eval_gettext 'Cannot store $stash_sha1')" &&
> + echo "
> +$(gettext 'Applying autostash resulted in conflicts.
> +...
This is confusing (or confused):
these && might && fail
|| die &&
success
It is much easier to read if you just drop && after die and write it
like so:
ref_stash=refs/stash &&
: >>"$GIT_DIR/logs/$ref_stash" &&
git update-ref -m "autostash" $ref_stash $stash_sha1 ||
die "$(eval_gettext 'Cannot store $stash_sha1')"
echo "... success message comes here..."
prev parent reply other threads:[~2013-05-10 15:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-10 14:26 [PATCH v2 0/8] rebase.autostash completed Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 1/8] am: suppress error output from a conditional Ramkumar Ramachandra
2013-05-10 14:46 ` Junio C Hamano
2013-05-11 23:38 ` Ramkumar Ramachandra
2013-05-12 3:09 ` Junio C Hamano
2013-05-10 14:26 ` [PATCH 2/8] rebase -i: don't error out if $state_dir already exists Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 3/8] am: tighten a conditional that checks for $dotest Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 4/8] rebase: prepare to do generic housekeeping Ramkumar Ramachandra
2013-05-10 14:33 ` Eric Sunshine
2013-05-10 15:18 ` Junio C Hamano
2013-05-10 15:32 ` Junio C Hamano
2013-05-10 16:39 ` Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 5/8] am: return control to caller, for housekeeping Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 6/8] rebase -i: " Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 7/8] rebase --merge: " Ramkumar Ramachandra
2013-05-10 14:26 ` [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash Ramkumar Ramachandra
2013-05-10 14:41 ` Eric Sunshine
2013-05-10 15:29 ` Junio C Hamano [this message]
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=7v38tu4zv7.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/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).