From 97056a3b85bbee72d6ede1b9478b03dee1db2d4e Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 13 Dec 2015 02:21:43 -0800 Subject: [PATCH] Preserve the exit code of the diff command in binary_safe_diff.sh Summary: Some versions of Subversion (1.9 in any case, maybe others) will duplicate diff headers, if the diff command run through --diff-cmd returns 0. This lead to T9970, where the addition of a new file with properties only shows the properties themselves in the review, not the content of the new file. Test Plan: This is a trivial change, is a test needed at all? Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: stevenh, Korvin, eadler Differential Revision: https://secure.phabricator.com/D14755 --- scripts/repository/binary_safe_diff.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/repository/binary_safe_diff.sh b/scripts/repository/binary_safe_diff.sh index 1473e804..b51d31a6 100755 --- a/scripts/repository/binary_safe_diff.sh +++ b/scripts/repository/binary_safe_diff.sh @@ -1,6 +1,8 @@ #!/bin/sh diff "$@" -if [ "$?" = "2" ]; then +RES="$?" +if [ "$RES" = "2" ]; then exit 1 fi +exit "$RES"