[PATCH] cg-update - refuse to update dirty tree
From: Martin Langhoff <hidden>
Date: 2016-06-15 22:42:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
cg-merge currently clobbers local changes while runnign cg-update. Do the safe thing and refuse to update on a dirty tree. Signed-off-by: Martin Langhoff <redacted> --- cg-update | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) 7a961c02ee6228c2a80869b4b3f179a7e279df8e
diff --git a/cg-update b/cg-update
--- a/cg-update
+++ b/cg-update@@ -27,6 +27,10 @@ while optparse; do fi done +# Better safe than sorry +(git-update-cache --refresh >> /dev/null) || + die "Your working tree is dirty - will not update." + name=${ARGS[0]} [ "$name" ] || { [ -s $_git/refs/heads/origin ] && name=origin; } [ "$name" ] || die "where to update from?"