diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-01-16 09:36:47 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-16 14:53:41 -0800 |
| commit | de694d232f1a1b1fe2ca4c7549242d7ef96cf759 (patch) | |
| tree | c1d87e533b08e495cfbf54e060ce0775d877ee6f /t | |
| parent | c010eb63079843f73b4906e2a5a048f5c4e88610 (diff) | |
| download | git-nd/commit-ignore-i-t-a.tar.gz | |
commit, write-tree: allow to ignore CE_INTENT_TO_ADD while writing treesnd/commit-ignore-i-t-a
Normally cache-tree will not produce trees from an index that has
CE_INTENT_TO_ADD entries. This is a safe measure to avoid
mis-interpreting user's intention regarding this flag.
There are situations however where users want to create trees/commits
regardless i-t-a entries. Allow such cases with commit.ignoreIntentToAdd
for git-commit and --ignore-intent-to-add for git-write-tree.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2203-add-intent.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh index 58a329961e..7b447d304f 100755 --- a/t/t2203-add-intent.sh +++ b/t/t2203-add-intent.sh @@ -44,6 +44,36 @@ test_expect_success 'cannot commit with i-t-a entry' ' test_must_fail git commit ' +test_expect_success 'can write-tree with i-t-a entry' ' + git reset --hard && + echo xyzzy >rezrov && + echo frotz >nitfol && + git add rezrov && + git add -N nitfol && + git write-tree --ignore-intent-to-add >actual && + echo 150389afa1ccf46e4104667c741cd0e598269511 >expected && + test_cmp expected actual +' + +test_expect_success 'can commit tree with i-t-a entry' ' + git reset --hard && + echo xyzzy >rezrov && + echo frotz >nitfol && + git add rezrov && + git add -N nitfol && + git config commit.ignoreIntentToAdd true && + git commit -m initial && + git ls-tree -r HEAD >actual && + cat >expected <<EOF && +100644 blob ce013625030ba8dba906f756967f9e9ca394464a elif +100644 blob ce013625030ba8dba906f756967f9e9ca394464a file +100644 blob cf7711b63209d0dbc2d030f7fe3513745a9880e4 rezrov +EOF + test_cmp expected actual && + git config commit.ignoreIntentToAdd false && + git reset HEAD^ +' + test_expect_success 'can commit with an unrelated i-t-a entry in index' ' git reset --hard && echo xyzzy >rezrov && |