diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-23 01:26:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 01:26:34 -0700 |
| commit | 646881a15612c0039af1a4307e3981fd48931326 (patch) | |
| tree | d99d586838643f36a052cde2db7b7b64dd21bef2 /git-commit.sh | |
| parent | Merge branch 'se/http' into next (diff) | |
| parent | Add git-quiltimport to .gitignore. (diff) | |
| download | tgif-646881a15612c0039af1a4307e3981fd48931326.tar.xz | |
Merge branch 'master' into next
* master:
Add git-quiltimport to .gitignore.
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
cvsimport: cleanup commit function
cvsimport: use git-update-index --index-info
git status: skip empty directories, and add -u to show all untracked files
cvsimport: repack every kilo-commits.
cvsimport: introduce -L<imit> option to workaround memory leaks
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/git-commit.sh b/git-commit.sh index 6ef1a9dedc..6785826fef 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Linus Torvalds # Copyright (c) 2006 Junio C Hamano -USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>) [--amend] [-e] [--author <author>] [[-i | -o] <path>...]' +USAGE='[-a] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit>] [-u] [--amend] [-e] [--author <author>] [[-i | -o] <path>...]' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -134,13 +134,17 @@ run_status () { report "Changed but not updated" \ "use git-update-index to mark for commit" + option="" + if test -z "$untracked_files"; then + option="--directory --no-empty-directory" + fi if test -f "$GIT_DIR/info/exclude" then - git-ls-files -z --others --directory \ + git-ls-files -z --others $option \ --exclude-from="$GIT_DIR/info/exclude" \ --exclude-per-directory=.gitignore else - git-ls-files -z --others --directory \ + git-ls-files -z --others $option \ --exclude-per-directory=.gitignore fi | perl -e '$/ = "\0"; @@ -203,6 +207,7 @@ verbose= signoff= force_author= only_include_assumed= +untracked_files= while case "$#" in 0) break;; esac do case "$1" in @@ -340,6 +345,12 @@ do verbose=t shift ;; + -u|--u|--un|--unt|--untr|--untra|--untrac|--untrack|--untracke|--untracked|\ + --untracked-|--untracked-f|--untracked-fi|--untracked-fil|--untracked-file|\ + --untracked-files) + untracked_files=t + shift + ;; --) shift break |