Re: [PATCH 03/13] contrib/subtree: Better Error Handling for add

2013-08-02 Thread Andreas Schwab 
David A. Greene gree...@obbligato.org writes:

   elif [ $# -eq 2 ]; then
 - cmd_add_repository $@
 + git rev-parse -q --verify $2^{commit} /dev/null ||
 + die '$2' does not refer to a commit

That doesn't make any sense.  $2 is a commit in a remote repository
which hasn't been fetched yet, so it can never be verified against the
local repository.

Andreas.

-- 
Andreas Schwab, sch...@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
And now for something completely different.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 03/13] contrib/subtree: Better Error Handling for add

2013-02-05 Thread David A. Greene 
From: David A. Greene gree...@obbligato.org

Check refspecs for validity before passing them on to other commands.
This lets us generate more helpful error messages.

Signed-off-by: David A. Greene gree...@obbligato.org
---
 contrib/subtree/git-subtree.sh |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 5598210..771f39d 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -497,12 +497,18 @@ cmd_add()
ensure_clean

if [ $# -eq 1 ]; then
-   cmd_add_commit $@
+   git rev-parse -q --verify $1^{commit} /dev/null ||
+   die '$1' does not refer to a commit
+
+   cmd_add_commit $@
elif [ $# -eq 2 ]; then
-   cmd_add_repository $@
+   git rev-parse -q --verify $2^{commit} /dev/null ||
+   die '$2' does not refer to a commit
+
+   cmd_add_repository $@
else
say error: parameters were '$@'
-   die Provide either a refspec or a repository and refspec.
+   die Provide either a commit or a repository and commit.
fi
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 03/13] contrib/subtree: Better Error Handling for add

2013-02-04 Thread David A. Greene 
From: David A. Greene gree...@obbligato.org

Check refspecs for validity before passing them on to other commands.
This lets us generate more helpful error messages.

Signed-off-by: David A. Greene gree...@obbligato.org
---
 contrib/subtree/git-subtree.sh |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 5598210..771f39d 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -497,12 +497,18 @@ cmd_add()
ensure_clean

if [ $# -eq 1 ]; then
-   cmd_add_commit $@
+   git rev-parse -q --verify $1^{commit} /dev/null ||
+   die '$1' does not refer to a commit
+
+   cmd_add_commit $@
elif [ $# -eq 2 ]; then
-   cmd_add_repository $@
+   git rev-parse -q --verify $2^{commit} /dev/null ||
+   die '$2' does not refer to a commit
+
+   cmd_add_repository $@
else
say error: parameters were '$@'
-   die Provide either a refspec or a repository and refspec.
+   die Provide either a commit or a repository and commit.
fi
 }
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html