From: Kevin Daudt <me@ikke.info>
To: Junio C Hamano <gitster@pobox.com>
Cc: Paul Tan <pyokagan@gmail.com>, git@vger.kernel.org
Subject: kd/
Date: Sat, 4 Jul 2015 23:00:32 +0200 [thread overview]
Message-ID: <20150704210032.GB7345@vps892.directvps.nl> (raw)
In-Reply-To: <xmqqh9q64a9p.fsf@gitster.dls.corp.google.com>
On Wed, Jun 17, 2015 at 08:36:34AM -0700, Junio C Hamano wrote:
> Kevin Daudt <me@ikke.info> writes:
>
> > - require_clean_work_tree "pull with rebase" "Please commit or stash them."
> > + if [ $(git config --bool --get rebase.autostash || echo false) = false ]
>
> Style (use of []).
Fixed it.
>
> Shouldn't you be doing
>
> if ...
> then
> on an unborn
> elif we are not doing autostash
> require clean work tree
> fi
>
> which does not need unnecessarily deep nesting?
>
You are right, much simpler. New patch is underway.
next prev parent reply other threads:[~2015-07-05 8:48 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 21:55 [PATCH] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-03 4:50 ` Paul Tan
2015-06-06 21:12 ` [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test Kevin Daudt
2015-06-11 13:20 ` Paul Tan
2015-06-06 21:12 ` [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-11 13:34 ` Paul Tan
2015-06-17 10:40 ` Kevin Daudt
2015-06-17 11:01 ` [PATCH v3] " Kevin Daudt
2015-06-17 15:36 ` Junio C Hamano
2015-07-04 21:00 ` Kevin Daudt [this message]
2015-07-04 21:42 ` [PATCH v4] " Kevin Daudt
2015-07-06 20:39 ` Junio C Hamano
2015-07-07 3:59 ` [PATCH v5] " Paul Tan
2015-07-22 19:07 ` Kevin Daudt
2015-07-22 19:42 ` Junio C Hamano
2015-07-22 20:48 ` Kevin Daudt
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150704210032.GB7345@vps892.directvps.nl \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).