diff options
| author | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 12:04:44 -0700 |
|---|---|---|
| committer | Peter Anvin <hpa@tazenda.sc.orionmulti.com> | 2005-10-03 12:04:44 -0700 |
| commit | 79a9d8ea0d88a3667ad19be8e705405ab5d896f1 (patch) | |
| tree | 15d04fe258e969f2a43aaff3c292286984d0147c /git-commit.sh | |
| parent | 039c6f162a63e9d91f360e2e6138e21a4015c543 (diff) | |
| parent | baaac6a7143ad07de62926421f8740cd640c241c (diff) | |
| download | git-79a9d8ea0d88a3667ad19be8e705405ab5d896f1.tar.xz | |
Merge with master.kernel.org:/pub/scm/git/git.git
Diffstat (limited to 'git-commit.sh')
| -rwxr-xr-x | git-commit.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/git-commit.sh b/git-commit.sh index 18b259c708..1206c20c2e 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -153,15 +153,8 @@ if [ -f "$GIT_DIR/MERGE_HEAD" ]; then fi >>.editmsg PARENTS="-p HEAD" -if [ ! -r "$GIT_DIR/HEAD" ]; then - if [ -z "$(git-ls-files)" ]; then - echo Nothing to commit 1>&2 - exit 1 - fi - PARENTS="" - current= -else - current=$(git-rev-parse --verify HEAD) +if GIT_DIR="$GIT_DIR" git-rev-parse --verify HEAD >/dev/null 2>&1 +then if [ -f "$GIT_DIR/MERGE_HEAD" ]; then PARENTS="-p HEAD "`sed -e 's/^/-p /' "$GIT_DIR/MERGE_HEAD"` fi @@ -194,6 +187,12 @@ else export GIT_AUTHOR_EMAIL export GIT_AUTHOR_DATE fi +else + if [ -z "$(git-ls-files)" ]; then + echo Nothing to commit 1>&2 + exit 1 + fi + PARENTS="" fi git-status >>.editmsg if [ "$?" != "0" -a ! -f $GIT_DIR/MERGE_HEAD ] |