aboutsummaryrefslogtreecommitdiff
path: root/t/t4017-diff-retval.sh
Commit message (Collapse)AuthorAge
* t4017 (diff-retval): replace manual exit code check with test_expect_codeElijah Newren2010-10-06
| | | | | | | | | | This commit takes advantage of Ævar Arnfjörð Bjarmason's recent change to test_expect_code (test-lib: make test_expect_code a test command) to simplify several testcases. Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jc/conflict-marker-size'Junio C Hamano2010-04-06
|\ | | | | | | | | * jc/conflict-marker-size: diff --check: honor conflict-marker-size attribute
| * diff --check: honor conflict-marker-size attributeJunio C Hamano2010-03-24
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | git-diff: add a test for git diff --quiet -wLarry D'Anna2010-02-21
|/ | | | | | | | | This patch adds two test cases for: 6977c25 git diff --quiet -w: check and report the status Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Fix t4017-diff-retval for white-space from wcBrian Gernhardt2008-06-29
| | | | | Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff --check: detect leftover conflict markersJunio C Hamano2008-06-26
| | | | | | | | | | This teaches "diff --check" to detect and complain if the change adds lines that look like leftover conflict markers. We should be able to remove the old Perl script used in the sample pre-commit hook and modernize the script with this facility. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* diff --check: do not discard error status upon seeing a good lineJunio C Hamano2008-06-26
| | | | | | | | "git diff --check" should return non-zero when there was any whitespace error but the code only paid attention to the error status of the last new line in the patch. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Test interaction between diff --check and --exit-codeWincent Colaiuta2007-12-14
| | | | | | | Make sure that it works as advertised in the man page. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Allow git-diff exit with codes similar to diff(1)Alex Riesen2007-03-14
This introduces a new command-line option: --exit-code. The diff programs will return 1 for differences, return 0 for equality, and something else for errors. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>