diff options
| author | Andreas Krey <a.krey@gmx.de> | 2016-12-02 23:15:13 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-05 12:41:06 -0800 |
| commit | 319d835240b752b94ccb67f6515759824955937b (patch) | |
| tree | 65508ce4b116e35dffa929b2137c08ab1ad41036 /t | |
| parent | 0202c411edc25940cc381bf317badcdf67670be4 (diff) | |
| download | git-319d835240b752b94ccb67f6515759824955937b.tar.gz git-319d835240b752b94ccb67f6515759824955937b.tar.xz | |
commit: make --only --allow-empty work without paths
--only is implied when paths are present, and required
them unless --amend. But with --allow-empty it should
be allowed as well - it is the only way to create an
empty commit in the presence of staged changes.
Signed-off-by: Andreas Krey <a.krey@gmx.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7501-commit.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index d84897a67..0d8d89309 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -155,6 +155,15 @@ test_expect_success 'amend --only ignores staged contents' ' git diff --exit-code ' +test_expect_success 'allow-empty --only ignores staged contents' ' + echo changed-again >file && + git add file && + git commit --allow-empty --only -m "empty" && + git cat-file blob HEAD:file >file.actual && + test_cmp file.expect file.actual && + git diff --exit-code +' + test_expect_success 'set up editor' ' cat >editor <<-\EOF && #!/bin/sh |