kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'kk/maint-1.7.9-commit-tree' into kk/maint-commit-tree 

* kk/maint-1.7.9-commit-tree:
  commit-tree: resurrect command line parsing updates
maint
Junio C Hamano 2012-07-17 13:10:49 -07:00
parent d28436736a 9aab1b5118
commit 53bcf22afa
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/commit-tree.c
View File

@ -48,9 +48,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
if (argc < 2 || !strcmp(argv[1], "-h")) if (argc < 2 || !strcmp(argv[1], "-h"))
usage(commit_tree_usage); usage(commit_tree_usage);


if (get_sha1(argv[1], tree_sha1))
die("Not a valid object name %s", argv[1]);

for (i = 1; i < argc; i++) { for (i = 1; i < argc; i++) {
const char *arg = argv[i]; const char *arg = argv[i];
if (!strcmp(arg, "-p")) { if (!strcmp(arg, "-p")) {

17
t/t1100-commit-tree-options.sh
View File

@ -7,6 +7,9 @@ test_description='git commit-tree options test


This test checks that git commit-tree can create a specific commit This test checks that git commit-tree can create a specific commit
object by defining all environment variables that it understands. object by defining all environment variables that it understands.

Also make sure that command line parser understands the normal
"flags first and then non flag arguments" command line.
' '


. ./test-lib.sh . ./test-lib.sh
@ -42,4 +45,18 @@ test_expect_success \
'compare commit' \ 'compare commit' \
'test_cmp expected commit' 'test_cmp expected commit'



test_expect_success 'flags and then non flags' '
echo comment text |
git commit-tree $(cat treeid) >commitid &&
echo comment text |
git commit-tree $(cat treeid) -p $(cat commitid) >childid-1 &&
echo comment text |
git commit-tree -p $(cat commitid) $(cat treeid) >childid-2 &&
test_cmp childid-1 childid-2 &&
git commit-tree $(cat treeid) -m foo >childid-3 &&
git commit-tree -m foo $(cat treeid) >childid-4 &&
test_cmp childid-3 childid-4
'

test_done test_done