From: "Jan Krüger" <jk@jk.gs>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] pull --rebase: exit early when the working directory is dirty
Date: Wed, 21 May 2008 15:31:10 +0200 [thread overview]
Message-ID: <20080521153110.059bc6a3@neuron> (raw)
In-Reply-To: <alpine.DEB.1.00.0805211230290.30431@racer>
Hi,
> When rebasing fails during "pull --rebase", you cannot just clean up
> the working directory and call "pull --rebase" again, since the
> remote branch was already fetched.
>
> Therefore, die early when the working directory is dirty.
Good idea.
> + git update-index --refresh &&
> + git diff-files --quiet &&
> + git diff-index --cached --quiet HEAD -- ||
> + die "refusing to pull with rebase: your working tree is not
> up-to-date"
Perhaps the "up-to-date" should be changed to something else, following
the recent discussion about the "up-to-date" message in checkout (but
here we don't have to worry about breaking anything else). In that case,
I'd suggest:
"Refusing to pull with rebase: your working tree has uncommitted
changes"
--
Best regards
Jan Krüger <jk@jk.gs>
next prev parent reply other threads:[~2008-05-21 13:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-21 11:32 [PATCH] pull --rebase: exit early when the working directory is dirty Johannes Schindelin
2008-05-21 12:04 ` Andreas Ericsson
2008-05-21 13:31 ` Jan Krüger [this message]
2008-05-21 15:11 ` Geert Bosch
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=20080521153110.059bc6a3@neuron \
--to=jk@jk.gs \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).