diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-08-21 10:57:59 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-21 21:19:35 -0700 |
| commit | 3deffc52d88df73af72a80a406eb863880bb4d2a (patch) | |
| tree | 2480b9d9bf4492de8279531ead66bd32ee5032e0 /t/t7102-reset.sh | |
| parent | 43673fddd3c8a0e2cadc8ba724552531fac55464 (diff) | |
| download | git-3deffc52d88df73af72a80a406eb863880bb4d2a.tar.gz git-3deffc52d88df73af72a80a406eb863880bb4d2a.tar.xz | |
reset: make the reminder output consistent with "checkout"
git reset without argument displays a summary of the local modification,
like this:
$ git reset
Makefile: locally modified
Some people have problems with this; they look like an error message.
This patch makes its output mimic how "git checkout $another_branch"
reports the paths with local modifications. "git add --refresh --verbose"
is changed in the same way.
It also adds a header to make it clear that the output is informative,
and not an error.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Diffstat (limited to 't/t7102-reset.sh')
| -rwxr-xr-x | t/t7102-reset.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index e637c7d4d..e85ff02c3 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -419,7 +419,8 @@ test_expect_success 'resetting an unmodified path is a no-op' ' ' cat > expect << EOF -file2: locally modified +Unstaged changes after reset: +M file2 EOF test_expect_success '--mixed refreshes the index' ' |