Re: [PATCH 9/9] commit: suppress status summary when no changes staged
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Aug 11, 2010, 07:30 UTC
- Message-ID
- <20100811073028.GA5450@burratino>
- In-Reply-To
- <201008110911.40133.trast@student.ethz.ch>
Thomas Rast wrote:
> Jonathan Nieder wrote:
Show 18 quoted lines
>> Example: before: >> >> $ git commit >> # On branch master >> # Changed but not updated: >[...] >> no changes added to commit (use "git add" and/or "git commit -a") >> $ >> >> After: >> >> $ git commit >> no changes added to commit (use "git add" and/or "git commit -a") >> $ > > Either Junio just picked this up in the last push or I just never > noticed before, but this breaks t6040 which tests for the "On branch > ..." stuff
Yep, Ævar noticed the same. That test is meant to check that when git commit/status gives status information it reflects the correct tracking info. So maybe:
-- 8< -- Subject: t6040 (branch tracking): check “status” instead of “commit”
Among the tests for correct branch tracking output is one that examines “git commit” output:
$ git commit # Your branch and 'origin/maint' have diverged, # and have 9 and 69 different commit(s) each, respectively. [...] no changes added to commit (use "git add" and/or "git commit -a") $
But we are experimenting with changing that output. So drop that test for now and replace it with a test for “git status” (which was not being checked yet and shares the same output format and wt-status backend).
Reported-by: Thomas Rast <trast@student.ethz.ch> Reported-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> ---
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh index 1785e17..3bc91b1 100755 --- a/t/t6040-tracking-info.sh +++ b/t/t6040-tracking-info.sh @@ -64,7 +64,7 @@ test_expect_success 'checkout with local tracked branch' ' grep "is ahead of" actual ' -test_expect_success 'status' ' +test_expect_failure 'status' ' ( cd test && git checkout b1 >/dev/null &&