{"thread":{"id":"6596","subject":"[PATCH] Improved error message from git-rebase","startedAt":"2007-01-31T16:12:03Z","lastAt":"2007-01-31T16:12:03Z","messageCount":1,"participants":["=?utf-8?q?David_K=C3=A5gedal?="],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33149","messageId":"873b5r2mya.fsf@morpheus.local","threadId":"6596","inReplyTo":null,"subject":"[PATCH] Improved error message from git-rebase","fromName":"=?utf-8?q?David_K=C3=A5gedal?=","fromEmail":"davidk@lysator.liu.se","sentAt":"2007-01-31T16:12:03Z","receivedAt":"2007-01-31T16:12:03Z","isPatch":true,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"If the index wasn't clean, git-rebase would simply show the output from\ngit-diff-index with no further comment to the user.\n---\n git-rebase.sh |    3 ++-\n 1 files changed, 2 insertions(+), 1 deletions(-)\n\ngit-rebase sometimes fails without giving a useful error message.  Try\nthis:\n\n  $ touch asdf\n  $ git add asdf\n  $ git rebase origin/master\n  A       asdf\n  $ \n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 99cedad..9d2f71d 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -249,7 +249,8 @@ fi\n git-update-index --refresh || exit\n diff=$(git-diff-index --cached --name-status -r HEAD)\n case \"$diff\" in\n-?*)\techo \"$diff\"\n+?*)\techo \"cannot rebase: your index is not up-to-date\"\n+\techo \"$diff\"\n \texit 1\n \t;;\n esac\n-- \n1.5.0.rc2.86.gf4f4f-dirty\n\n\n-- \nDavid Kågedal\n"}]}