diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-10-19 04:34:02 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-10-19 04:34:02 (GMT) |
commit | 929e85ade811a1adaa573f79130b35843bed805e (patch) | |
tree | 18fdc0c84d48adbf214bb2d5ba1ef015bd7940ae /t | |
parent | 11877b9ebec87175a9cc55676311ef2d98585cca (diff) | |
parent | 73ba5d78b4e5d96b2c521e3d0a2ec86c26a2d25b (diff) | |
download | git-929e85ade811a1adaa573f79130b35843bed805e.zip git-929e85ade811a1adaa573f79130b35843bed805e.tar.gz git-929e85ade811a1adaa573f79130b35843bed805e.tar.bz2 |
Merge branch 'ss/wt-status-committable'
Code clean-up in the internal machinery used by "git status" and
"git commit --dry-run".
* ss/wt-status-committable:
roll wt_status_state into wt_status and populate in the collect phase
wt-status.c: set the committable flag in the collect phase
t7501: add test of "commit --dry-run --short"
wt-status: rename commitable to committable
wt-status.c: move has_unmerged earlier in the file
Diffstat (limited to 't')
-rwxr-xr-x | t/t7501-commit.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 1a6773e..f1349af 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -99,12 +99,12 @@ test_expect_success '--dry-run with stuff to commit returns ok' ' git commit -m next -a --dry-run ' -test_expect_failure '--short with stuff to commit returns ok' ' +test_expect_success '--short with stuff to commit returns ok' ' echo bongo bongo bongo >>file && git commit -m next -a --short ' -test_expect_failure '--porcelain with stuff to commit returns ok' ' +test_expect_success '--porcelain with stuff to commit returns ok' ' echo bongo bongo bongo >>file && git commit -m next -a --porcelain ' @@ -698,4 +698,10 @@ test_expect_success '--dry-run with conflicts fixed from a merge' ' git commit -m "conflicts fixed from merge." ' +test_expect_success '--dry-run --short' ' + >test-file && + git add test-file && + git commit --dry-run --short +' + test_done |