mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'kk/maint-commit-tree'
* kk/maint-commit-tree: Revert "git-commit-tree(1): update synopsis" commit-tree: resurrect command line parsing updates
This commit is contained in:
commit
a7fe78a895
|
@ -10,7 +10,7 @@ SYNOPSIS
|
|||
--------
|
||||
[verse]
|
||||
'git commit-tree' <tree> [(-p <parent>)...] < changelog
|
||||
'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...]
|
||||
'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree>
|
||||
|
||||
DESCRIPTION
|
||||
-----------
|
||||
|
|
|
@ -48,9 +48,6 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
|
|||
if (argc < 2 || !strcmp(argv[1], "-h"))
|
||||
usage(commit_tree_usage);
|
||||
|
||||
if (get_sha1_tree(argv[1], tree_sha1))
|
||||
die("Not a valid tree object name %s", argv[1]);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
const char *arg = argv[i];
|
||||
if (!strcmp(arg, "-p")) {
|
||||
|
|
|
@ -7,6 +7,9 @@ test_description='git commit-tree options test
|
|||
|
||||
This test checks that git commit-tree can create a specific commit
|
||||
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
|
||||
|
@ -42,4 +45,18 @@ test_expect_success \
|
|||
'compare 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
|
||||
|
|
Loading…
Reference in a new issue