From b39fee5953467eadbb365f82fdf521b1795fa686 Mon Sep 17 00:00:00 2001 From: Martin Blazik Date: Mon, 10 Jan 2022 15:36:42 +0100 Subject: [PATCH] Add exrea check for uncommited files --- bin/git-reset-master | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/git-reset-master b/bin/git-reset-master index ab3639d..e2a1486 100755 --- a/bin/git-reset-master +++ b/bin/git-reset-master @@ -16,9 +16,16 @@ if [[ "$git_workdir" != "$PWD" ]]; then exit 2 fi echo "OK" + +echo -n "CHECK uncommited files: " +if git diff-index --quiet HEAD --; then + echo "BAD" + exit 3 +fi +echo "OK" + echo echo "git fetch origin -p" git fetch echo "git reset --hard origin/master" git reset --hard origin/master -