diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2015-03-06 12:43:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 21:51:48 +0300 |
| commit | 40555000935147f56896e75b919b25f1f2d23aca (patch) | |
| tree | e766d403051e23119d75f2a79209def6048243b9 /t | |
| parent | f8c65c1f97b364a8e90267e66193cf20aa60ca6e (diff) | |
commit/status: show the index-worktree diff with -v -v
git commit and git status in long format show the diff between HEAD
and the index when given -v. This allows previewing a commit to be made.
They also list tracked files with unstaged changes, but without a diff.
Introduce '-v -v' which shows the diff between the index and the
worktree in addition to the HEAD index diff. This allows a review of unstaged
changes which might be missing from the commit.
In the case of '-v -v', additonal header lines
Changes to be committed:
and
Changes not staged for commit:
are inserted before the diffs, which are equal to those in the status
part; the latter preceded by 50*"-" to make it stick out more.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7508-status.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t7508-status.sh b/t/t7508-status.sh index e3c9cf9c10..6b16bcb640 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -143,6 +143,17 @@ test_expect_success 'status -v' ' test_i18ncmp expect-with-v output ' +test_expect_success 'status -v -v' ' + (cat expect && + echo "Changes to be committed:" && + git -c diff.mnemonicprefix=true diff --cached && + echo "--------------------------------------------------" && + echo "Changes not staged for commit:" && + git -c diff.mnemonicprefix=true diff) >expect-with-v && + git status -v -v >output && + test_i18ncmp expect-with-v output +' + test_expect_success 'setup fake editor' ' cat >.git/editor <<-\EOF && #! /bin/sh |