From: =?utf-8?q?David_K=C3=A5gedal?= <davidk@lysator.liu.se>
To: git@vger.kernel.org
Subject: [PATCH] Improved error message from git-rebase
Date: Wed, 31 Jan 2007 17:12:03 +0100 [thread overview]
Message-ID: <873b5r2mya.fsf@morpheus.local> (raw)
If the index wasn't clean, git-rebase would simply show the output from
git-diff-index with no further comment to the user.
---
git-rebase.sh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
git-rebase sometimes fails without giving a useful error message. Try
this:
$ touch asdf
$ git add asdf
$ git rebase origin/master
A asdf
$
diff --git a/git-rebase.sh b/git-rebase.sh
index 99cedad..9d2f71d 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -249,7 +249,8 @@ fi
git-update-index --refresh || exit
diff=$(git-diff-index --cached --name-status -r HEAD)
case "$diff" in
-?*) echo "$diff"
+?*) echo "cannot rebase: your index is not up-to-date"
+ echo "$diff"
exit 1
;;
esac
--
1.5.0.rc2.86.gf4f4f-dirty
--
David Kågedal
reply other threads:[~2007-01-31 16:15 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=873b5r2mya.fsf@morpheus.local \
--to=davidk@lysator.liu.se \
--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).