Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [PATCH] diff: exit(1) if 'diff --quiet <repo file> <external file>' finds changes

From: Jeff King <hidden>
Date: 2016-06-15 22:54:07

On Fri, Jun 15, 2012 at 01:08:32PM -0700, Junio C Hamano wrote:
Tim Henigan [off-list ref] writes:
quoted
quoted
quoted
@@ -273,5 +273,6 @@ void diff_no_index(struct rev_info *revs,
       * The return code for --no-index imitates diff(1):
       * 0 = no changes, 1 = changes, else error
       */
-     exit(revs->diffopt.found_changes);
+     result = !!diff_result_code(&revs->diffopt, 0);
+     exit(result);
I assume the '!!' before 'diff_result_code' is a typo.
Not a typo.  I meant to use that idiom to turn 0 or not into
boolean, as diff_result_code() can return values other than 0 or 1.
I wonder if that is a good idea, though. AFAICT, diff_result_code will
only return a different exit code if "--check" is used. If we pass along
the exit code fully, then:

  1. If --check is not used, we will be diff(1)-compatible.

  2. If --check is used, then we will not be compatible with diff(1) in
     our exit code. But diff(1) does not have --check in the first
     place, so there is no point in us trying to be a drop-in
     replacement.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help