projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
diff-tree -c: show a merge commit a bit more sensibly.
[git.git]
/
git-status.sh
diff --git
a/git-status.sh
b/git-status.sh
index
b90ffc1
..
10d781c
100755
(executable)
--- a/
git-status.sh
+++ b/
git-status.sh
@@
-2,7
+2,16
@@
#
# Copyright (c) 2005 Linus Torvalds
#
#
# Copyright (c) 2005 Linus Torvalds
#
-GIT_DIR=$(git-rev-parse --git-dir) || exit
+
+USAGE=''
+SUBDIRECTORY_OK='Yes'
+
+. git-sh-setup
+
+if [ "$#" != "0" ]
+then
+ usage
+fi
report () {
header="#
report () {
header="#
@@
-13,7
+22,7
@@
report () {
trailer=""
while read status name newname
do
trailer=""
while read status name newname
do
-
echo -n
"$header"
+
printf '%s'
"$header"
header=""
trailer="#
"
header=""
trailer="#
"
@@
-27,7
+36,7
@@
report () {
U ) echo "# unmerged: $name";;
esac
done
U ) echo "# unmerged: $name";;
esac
done
-
echo -n
"$trailer"
+
printf '%s'
"$trailer"
[ "$header" ]
}
[ "$header" ]
}
@@
-74,11
+83,11
@@
report "Changed but not updated" "use git-update-index to mark for commit"
if test -f "$GIT_DIR/info/exclude"
then
if test -f "$GIT_DIR/info/exclude"
then
- git-ls-files -z --others \
+ git-ls-files -z --others
--directory
\
--exclude-from="$GIT_DIR/info/exclude" \
--exclude-per-directory=.gitignore
else
--exclude-from="$GIT_DIR/info/exclude" \
--exclude-per-directory=.gitignore
else
- git-ls-files -z --others \
+ git-ls-files -z --others
--directory
\
--exclude-per-directory=.gitignore
fi |
perl -e '$/ = "\0";
--exclude-per-directory=.gitignore
fi |
perl -e '$/ = "\0";