diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-05-26 13:55:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-29 05:51:28 (GMT) |
| commit | 431bb23a271ef45e22ad4a2def2e0ba0a1954e98 (patch) | |
| tree | a07933e455138fb49c7b35f63bd2816dd7cc06c3 /t | |
| parent | fb6fbffbdae719805fbf7a39ca268dad17696f82 (diff) | |
| download | git-431bb23a271ef45e22ad4a2def2e0ba0a1954e98.zip git-431bb23a271ef45e22ad4a2def2e0ba0a1954e98.tar.gz git-431bb23a271ef45e22ad4a2def2e0ba0a1954e98.tar.bz2 | |
am: move advice.amWorkDir parsing back to advice.c
The only benefit from this move (apart from cleaner code) is that
advice.amWorkDir should now show up in `git help --config`. There
should be no regression since advice config is always read by the
git_default_config().
While at there, use advise() like other code. We now get "hint: "
prefix and the output is stderr instead of stdout (which is also the
reason for the test update because stderr is checked in a following
test and the extra advice can fail it).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4254-am-corrupt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 168739c..fd3bdbf 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -25,7 +25,7 @@ test_expect_success setup ' # fatal: unable to write file '(null)' mode 100644: Bad address # Also, it had the unwanted side-effect of deleting f. test_expect_success 'try to apply corrupted patch' ' - test_must_fail git am bad-patch.diff 2>actual + test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual ' test_expect_success 'compare diagnostic; ensure file is still here' ' |