summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-26 10:18:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-26 10:18:51 (GMT)
commit3496277a561307c3d31d2085347af8eb4c667c36 (patch)
tree6ebd68e62f0fef1def59bb711cf167cefdb899e7
parent2d86d2c6fcbd62696447fe3dbfac664e6c82b0ce (diff)
downloadgit-3496277a561307c3d31d2085347af8eb4c667c36.zip
git-3496277a561307c3d31d2085347af8eb4c667c36.tar.gz
git-3496277a561307c3d31d2085347af8eb4c667c36.tar.bz2
commit-tree: allow generic object name for the tree as well.
We use get_sha1() for -p (parent) objects, but still used get_sha1_hex() for the tree. Just to be consistent, allow extended SHA1 expression for the tree object name. Note that this is not to encourage funky things like this: git-commit-tree HEAD^{tree} -p HEAD Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--commit-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-tree.c b/commit-tree.c
index 2d86518..e91af4b 100644
--- a/commit-tree.c
+++ b/commit-tree.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
git_config(git_default_config);
- if (argc < 2 || get_sha1_hex(argv[1], tree_sha1) < 0)
+ if (argc < 2 || get_sha1(argv[1], tree_sha1) < 0)
usage(commit_tree_usage);
check_valid(tree_sha1, tree_type);