summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-26 23:53:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-28 19:15:09 (GMT)
commit9804b7dc1974d59d4d37c37ba4624bb835456207 (patch)
tree00ea6ac52cf531e1c226c7280e412e4c1bb010d0
parent9a9cbb6e9f2a5ceca16cae2a959a7162abc36c54 (diff)
downloadgit-9804b7dc1974d59d4d37c37ba4624bb835456207.zip
git-9804b7dc1974d59d4d37c37ba4624bb835456207.tar.gz
git-9804b7dc1974d59d4d37c37ba4624bb835456207.tar.bz2
Show the branch name more prominently in "git status".
When not working on "master" branch, remind the user at the beginning of the status message, not at the end. Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-commit-script4
-rwxr-xr-xgit-status-script11
2 files changed, 7 insertions, 8 deletions
diff --git a/git-commit-script b/git-commit-script
index e47a090..4987e37 100755
--- a/git-commit-script
+++ b/git-commit-script
@@ -195,8 +195,8 @@ else
fi
if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ]
then
- sed -ne '/^#/p' .editmsg
- rm .editmsg
+ rm -f .editmsg
+ git-status-script
exit 1
fi
case "$no_edit" in
diff --git a/git-status-script b/git-status-script
index 947cc21..1999a66 100755
--- a/git-status-script
+++ b/git-status-script
@@ -28,6 +28,11 @@ report () {
[ "$header" ]
}
+branch=`readlink "$GIT_DIR/HEAD"`
+case "$branch" in
+refs/heads/master) ;;
+*) echo "# On branch $branch" ;;
+esac
git-update-cache --refresh >/dev/null 2>&1
git-diff-cache -M --cached HEAD | sed 's/^://' | report "Updated but not checked in" "will commit"
committable="$?"
@@ -37,10 +42,4 @@ then
echo "nothing to commit"
exit 1
fi
-branch=`readlink "$GIT_DIR/HEAD"`
-case "$branch" in
-refs/heads/master) ;;
-*) echo "#
-# On branch $branch" ;;
-esac
exit 0