From: Junio C Hamano <junkio@cox.net>
Date: Wed, 15 Feb 2006 01:51:02 +0000 (-0800)
Subject: Merge branch 'jc/commit'
X-Git-Tag: v1.3.0-rc1~212
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=756e3ee0c62b44bd700ffb2d58c371b45ea4598e;p=git.git

Merge branch 'jc/commit'

* jc/commit:
  commit: detect misspelled pathspec while making a partial commit.
  combine-diff: diff-files fix (#2)
  combine-diff: diff-files fix.
---

756e3ee0c62b44bd700ffb2d58c371b45ea4598e
diff --cc git-commit.sh
index ab5e6bc1c,fe9b6e752..f7ee1aade
--- a/git-commit.sh
+++ b/git-commit.sh
@@@ -340,12 -341,8 +341,8 @@@ case "$#,$also$only" i
  0,)
    ;;
  *,)
-   echo >&2 "assuming --only paths..."
 -  only_include_assumed="# Explicit paths specified without -i nor -o; assuming --include paths..."
 -  also=t
++  only_include_assumed="# Explicit paths specified without -i nor -o; assuming --only paths..."
 +  also=
- 
-   # If we are going to launch an editor, the message won't be
-   # shown without this...
-   test -z "$log_given$status_only" && sleep 1
    ;;
  esac
  unset only