diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-03 00:03:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-03 00:36:49 -0800 |
| commit | 36863af16e91aebc87696209f4f4780cf4c4059f (patch) | |
| tree | f6fca86a50d4f45b7f4ac2afb653401602f91cd3 /t/t7501-commit.sh | |
| parent | 13aba1e514c1dceee9d731d157bbc261426be351 (diff) | |
| download | git-36863af16e91aebc87696209f4f4780cf4c4059f.tar.gz git-36863af16e91aebc87696209f4f4780cf4c4059f.tar.xz | |
git-commit --allow-empty
It does not usually make sense to record a commit that has the exact
same tree as its sole parent commit and that is why git-commit prevents
you from making such a mistake, but when data from foreign scm is
involved, it is a different story. We are equipped to represent such an
(perhaps insane, perhaps by mistake, or perhaps done on purpose) empty
change, and it is better to represent it bypassing the safety valve for
native use.
This is primarily for use by foreign scm interface scripts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7501-commit.sh')
| -rwxr-xr-x | t/t7501-commit.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 2e7bcb016..0316ecf5a 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -256,6 +256,13 @@ test_expect_success 'same tree (single parent)' ' ' +test_expect_success 'same tree (single parent) --allow-empty' ' + + git commit --allow-empty -m "forced empty" && + git cat-file commit HEAD | grep forced + +' + test_expect_success 'same tree (merge and amend merge)' ' git checkout -b side HEAD^ && |