summaryrefslogtreecommitdiff
path: root/read-tree.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-08 16:43:23 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-08 16:43:23 -0700
commitbd8e265d67d93e83ee48fed565627522c1553654 (patch)
treeae1e7b666f0f6698dda7d24e10064768edbe5299 /read-tree.c
parentMerge branch 'jc/bindiff' into next (diff)
parentTeach git-clean optional <paths>... parameters. (diff)
downloadtgif-bd8e265d67d93e83ee48fed565627522c1553654.tar.xz
Merge branch 'jc/clean' into next
* jc/clean: Teach git-clean optional <paths>... parameters. Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
Diffstat (limited to 'read-tree.c')
-rw-r--r--read-tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/read-tree.c b/read-tree.c
index 5d30464106..c25385d79f 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -880,8 +880,8 @@ int main(int argc, char **argv)
if (1 < index_only + update)
usage(read_tree_usage);
- if (get_sha1(arg, sha1) < 0)
- usage(read_tree_usage);
+ if (get_sha1(arg, sha1))
+ die("Not a valid object name %s", arg);
if (list_tree(sha1) < 0)
die("failed to unpack tree object %s", arg);
stage++;