[PATCH] Improved error message from git-rebase

* [PATCH] Improved error message from git-rebase
@ 2007-01-31 16:12 =?utf-8?q?David_K=C3=A5gedal?=
  0 siblings, 0 replies; only message in thread
From: =?utf-8?q?David_K=C3=A5gedal?= @ 2007-01-31 16:12 UTC (permalink / raw)
  To: git

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

^ permalink raw reply related	[flat|nested] only message in thread