From 2420ec1de0f07854fe2a9c8c9f414b47594933e9 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 27 Dec 2013 17:59:10 -0600 Subject: [PATCH] shears.sh: quit early on dirty work tree ... not only after generating the script, when rebase -i complains... Signed-off-by: Johannes Schindelin --- share/msysGit/shears.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/share/msysGit/shears.sh b/share/msysGit/shears.sh index 14c73466..c89dea1c 100755 --- a/share/msysGit/shears.sh +++ b/share/msysGit/shears.sh @@ -540,6 +540,11 @@ upstream="$1" && onto=${onto:-$upstream}|| die "Could not determine rebase parameters" +git update-index -q --ignore-submodules --refresh && +git diff-files --quiet --ignore-submodules && +git diff-index --cached --quiet --ignore-submodules HEAD -- || +die 'There are uncommitted changes!' + setup # Rebase! -- 2.11.4.GIT