Re: My first git success [not quite]

From: Junio C Hamano <junkio@cox.net>
Date: Jan 14, 2006, 20:31 UTC
Message-ID: <7vzmlyft61.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <86acdyu2dz.fsf@blue.stonehenge.com>

merlyn@stonehenge.com (Randal L. Schwartz) writes:

Show 5 quoted lines

> Well, I'm a developer and *I* also had that problem while working
> on my "ajax" branch.
>
> Maybe git-checkout should by default *warn* when it is leaving
> things in the tree that are indexed but not updated in the index...

What Linus already said. But you may find this on top of the current "master" branch useful.

Likes, dislikes?

-- >8 -- [PATCH] checkout: show dirty state upon switching branches.

This shows your working file state when you switch branches. As a side effect, "git checkout" without any branch name (i.e. stay on the current branch) becomes a more concise shorthand for the "git status" command.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-checkout.sh b/git-checkout.sh
index bd7f007..d99688f 100755
--- a/git-checkout.sh
+++ b/git-checkout.sh
@@ -164,6 +164,9 @@ else
 	esac
 	exit 0
     )
+    saved_err=$?
+    git diff-files --name-status
+    (exit $saved_err)
 fi
 
 #