Merge pull request #170 from twaugh/git-extended-diffs-default-include

Merge 0.4.x changes

Author: twaugh

Makefile.am

@@ -423,6 +423,7 @@ TESTS = tests/newline1/run-test \
 	tests/git-rename-issue22/run-test \
 	tests/git-binary-issue57/run-test \
 	tests/git-binary-formats/run-test \
+	tests/git-extended-diffs/run-test \
 	tests/git-mode-issue59/run-test \
 	tests/git-exclude-issue27/run-test \
 	tests/git-prefixes-option/run-test \

NEWS

@@ -3,6 +3,17 @@ Patchutils news
 
 0.4.5 (stable)
 
+	Reverted incompatible behavior change from version 0.4.4. In 0.4.4,
+	Git diffs without content hunks (renames, copies, mode-only changes,
+	binary files) were included in output and file numbering, breaking
+	compatibility with 0.4.3 and earlier versions. This caused file numbers
+	to change for scripts using -N/-F options. The 0.4.3 behavior has been
+	restored as the default: these diffs are now excluded from output and
+	numbering. Added --git-extended-diffs option to control this behavior:
+	use --git-extended-diffs=include to get the 0.4.4 behavior if needed.
+	The default will change to 'include' in version 0.5.0 for modern Git
+	workflow support. Addresses GitHub issue #157.
+
 	Fixed grepdiff -s/--status to display correct file status indicators.
 	Previously, grepdiff -s incorrectly showed '!' (modification) for all
 	matching files regardless of whether they were additions, deletions,

doc/patchutils.xml

@@ -592,6 +592,7 @@
           </group>
           <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
           <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
+          <arg choice="opt">--git-extended-diffs=<replaceable>exclude|include</replaceable></arg>
           <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
@@ -799,6 +800,18 @@
 			in version 0.5.0.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--git-extended-diffs</option>=<replaceable>exclude|include</replaceable></term>
+            <listitem>
+              <para>Controls whether to process Git diffs without traditional content hunks.
+	        This includes renames, copies, mode-only changes, and binary files.
+	        With <literal>exclude</literal>, these diffs are skipped (this was
+	        the default in versions prior to 0.5.0). With <literal>include</literal>
+	        (the default), these diffs are processed normally. This option affects
+	        file numbering with <option>-N</option> and file filtering with
+	        <option>-F</option>.</para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
             <listitem>
@@ -1078,6 +1091,7 @@ patch.file]]></screen></para>
           </group>
           <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
           <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
+          <arg choice="opt">--git-extended-diffs=<replaceable>exclude|include</replaceable></arg>
           <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
@@ -1264,6 +1278,18 @@ patch.file]]></screen></para>
 			in version 0.5.0.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--git-extended-diffs</option>=<replaceable>exclude|include</replaceable></term>
+            <listitem>
+              <para>Controls whether to process Git diffs without traditional content hunks.
+	        This includes renames, copies, mode-only changes, and binary files.
+	        With <literal>exclude</literal>, these diffs are skipped (this was
+	        the default in versions prior to 0.5.0). With <literal>include</literal>
+	        (the default), these diffs are processed normally. This option affects
+	        file numbering with <option>-N</option> and file filtering with
+	        <option>-F</option>.</para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
             <listitem>
@@ -1457,6 +1483,7 @@ done)]]></screen></para>
           </group>
           <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
           <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
+          <arg choice="opt">--git-extended-diffs=<replaceable>exclude|include</replaceable></arg>
           <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
           <group choice="opt">
             <arg>-s</arg>
@@ -1666,6 +1693,18 @@ This is the same as gitdiff but uses git show instead of git diff.
 			in version 0.5.0.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--git-extended-diffs</option>=<replaceable>exclude|include</replaceable></term>
+            <listitem>
+              <para>Controls whether to process Git diffs without traditional content hunks.
+	        This includes renames, copies, mode-only changes, and binary files.
+	        With <literal>exclude</literal>, these diffs are skipped (this was
+	        the default in versions prior to 0.5.0). With <literal>include</literal>
+	        (the default), these diffs are processed normally. This option affects
+	        file numbering with <option>-N</option> and file filtering with
+	        <option>-F</option>.</para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
             <listitem>
@@ -2050,6 +2089,7 @@ This is the same as gitdiff but uses git show instead of git diff.
           </group>
           <arg choice="opt">--strip=<replaceable>n</replaceable></arg>
           <arg choice="opt">--git-prefixes=<replaceable>strip|keep</replaceable></arg>
+          <arg choice="opt">--git-extended-diffs=<replaceable>exclude|include</replaceable></arg>
           <arg choice="opt">--addprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addoldprefix=<replaceable>PREFIX</replaceable></arg>
           <arg choice="opt">--addnewprefix=<replaceable>PREFIX</replaceable></arg>
@@ -2199,6 +2239,18 @@ This is the same as gitdiff but uses git show instead of git diff.
 			in version 0.5.0.</para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term><option>--git-extended-diffs</option>=<replaceable>exclude|include</replaceable></term>
+            <listitem>
+              <para>Controls whether to process Git diffs without traditional content hunks.
+	        This includes renames, copies, mode-only changes, and binary files.
+	        With <literal>exclude</literal>, these diffs are skipped (this was
+	        the default in versions prior to 0.5.0). With <literal>include</literal>
+	        (the default), these diffs are processed normally. This option affects
+	        file numbering with <option>-N</option> and file filtering with
+	        <option>-F</option>.</para>
+            </listitem>
+          </varlistentry>
           <varlistentry>
             <term><option>--addprefix</option>=<replaceable>PREFIX</replaceable></term>
             <listitem>

src/filterdiff.c

@@ -112,6 +112,33 @@ static unsigned long filecount=0;
 
 static enum git_prefix_mode git_prefix_mode = GIT_PREFIX_KEEP;
 
+enum git_extended_diffs_mode {
+	GIT_EXTENDED_DIFFS_EXCLUDE = 0,  /* Skip extended diffs (0.4.3 behavior) */
+	GIT_EXTENDED_DIFFS_INCLUDE = 1   /* Process extended diffs (Git workflow) */
+};
+
+static enum git_extended_diffs_mode git_extended_diffs_mode = GIT_EXTENDED_DIFFS_INCLUDE;
+
+/* Helper function to check if a git diff type should be excluded based on mode */
+static int
+should_skip_git_extended_diff (enum git_diff_type git_type)
+{
+	if (git_extended_diffs_mode == GIT_EXTENDED_DIFFS_INCLUDE)
+		return 0;  /* Don't skip anything if include mode */
+
+	/* In exclude mode, skip all diffs without content hunks.
+	 * This includes renames, copies, mode-only changes, binary files,
+	 * and new/deleted files without content (e.g., binary files).
+	 * This restores 0.4.3 behavior where only files with actual
+	 * patch hunks were shown. */
+	switch (git_type) {
+	case GIT_DIFF_NORMAL:
+		return 0;  /* Don't skip - has hunks */
+	default:
+		return 1;  /* Skip all extended/special types */
+	}
+}
+
 /* Helper function to check if current patch is a Git patch */
 static int
 is_git_patch (char **headers, unsigned int num_headers)
@@ -1314,7 +1341,11 @@ static int filterdiff (FILE *f, const char *patchname)
 				/* Process as git diff without hunks and then exit */
 				enum git_diff_type git_type = detect_git_diff_type (header, num_headers);
 
-								if (git_type != GIT_DIFF_NORMAL) {
+
+				/* Skip extended diffs if in exclude mode */
+				if (should_skip_git_extended_diff (git_type))
+					goto eof;
+				if (git_type != GIT_DIFF_NORMAL) {
 					char *git_old_name = NULL, *git_new_name = NULL;
 					const char *p_stripped;
 					int match;
@@ -1391,7 +1422,11 @@ static int filterdiff (FILE *f, const char *patchname)
 			/* Check if this is a git diff without hunks or with content like Binary files */
 			enum git_diff_type git_type = detect_git_diff_type (header, num_headers);
 
-						if (git_type != GIT_DIFF_NORMAL) {
+
+			/* Skip extended diffs if in exclude mode */
+			if (should_skip_git_extended_diff (git_type))
+				goto flush_continue;
+			if (git_type != GIT_DIFF_NORMAL) {
 				/* This is a git diff without hunks - handle it */
 				char *git_old_name = NULL, *git_new_name = NULL;
 				const char *p_stripped;
@@ -1633,6 +1668,9 @@ const char * syntax_str =
 "  --git-prefixes=strip|keep\n"
 "            how to handle a/ and b/ prefixes in Git diffs for both filename\n"
 "            matching (-i/-x) and output (default: keep)\n"
+"  --git-extended-diffs=exclude|include\n"
+"            process Git diffs without hunks: renames, copies, mode-only\n"
+"            changes, binary files; default is include\n"
 "  --addprefix=PREFIX\n"
 "            prefix pathnames with PREFIX\n"
 "  --addoldprefix=PREFIX\n"
@@ -1893,6 +1931,7 @@ int main (int argc, char *argv[])
 			{"file", 1, 0, 'f'},
 			{"in-place", 0, 0, 1000 + 'w'},
 			{"git-prefixes", 1, 0, 1000 + 'G'},
+			{"git-extended-diffs", 1, 0, 1000 + 'D'},
 			{0, 0, 0, 0}
 		};
 		char *end;
@@ -2085,6 +2124,15 @@ int main (int argc, char *argv[])
 				error(EXIT_FAILURE, 0, "invalid argument to --git-prefixes: %s (expected 'strip' or 'keep')", optarg);
 			}
 			break;
+		case 1000 + 'D':
+			if (!strcmp(optarg, "exclude")) {
+				git_extended_diffs_mode = GIT_EXTENDED_DIFFS_EXCLUDE;
+			} else if (!strcmp(optarg, "include")) {
+				git_extended_diffs_mode = GIT_EXTENDED_DIFFS_INCLUDE;
+			} else {
+				error(EXIT_FAILURE, 0, "invalid argument to --git-extended-diffs: %s (expected 'exclude' or 'include')", optarg);
+			}
+			break;
 		default:
 			syntax(1);
 		}

src/grep.c

@@ -150,6 +150,9 @@ static void syntax(int err)
 	fprintf(f, "  --addoldprefix=PREFIX        add PREFIX to old filenames\n");
 	fprintf(f, "  --addnewprefix=PREFIX        add PREFIX to new filenames\n");
 	fprintf(f, "  --git-prefixes=strip|keep    handle a/ and b/ prefixes in Git diffs (default: keep)\n");
+	fprintf(f, "  --git-extended-diffs=exclude|include\n");
+	fprintf(f, "            process Git diffs without hunks: renames, copies, mode-only\n");
+	fprintf(f, "            changes, binary files; default is include\n");
 	fprintf(f, "  --output-matching=file|hunk  output mode: full files or matching hunks only\n");
 	fprintf(f, "  --only-match=rem|add|mod|all show only removed, added, modified, or all matching lines\n");
 	fprintf(f, "  --as-numbered-lines=before|after  show matching lines with line numbers\n");

src/ls.c

@@ -95,6 +95,9 @@ static void syntax(int err)
     fprintf(f, "  --addoldprefix=PREFIX        add PREFIX to old filenames\n");
     fprintf(f, "  --addnewprefix=PREFIX        add PREFIX to new filenames\n");
     fprintf(f, "  --git-prefixes=strip|keep    handle a/ and b/ prefixes in Git diffs (default: keep)\n");
+    fprintf(f, "  --git-extended-diffs=exclude|include\n");
+    fprintf(f, "            process Git diffs without hunks: renames, copies, mode-only\n");
+    fprintf(f, "            changes, binary files; default is include\n");
     fprintf(f, "  -i PAT, --include=PAT        include only files matching PAT\n");
     fprintf(f, "  -x PAT, --exclude=PAT        exclude files matching PAT\n");
     fprintf(f, "  -I FILE, --include-from-file=FILE  include only files matching patterns in FILE\n");
@@ -159,6 +162,15 @@ static void process_patch_file(FILE *fp, const char *filename)
 
     while ((result = patch_scanner_next(scanner, &content)) == PATCH_SCAN_OK) {
         if (content->type == PATCH_CONTENT_HEADERS) {
+            /* Check if we should skip git extended diffs in exclude mode */
+            if (git_extended_diffs_mode == GIT_EXTENDED_DIFFS_EXCLUDE) {
+                enum git_diff_type git_type = content->data.headers->git_type;
+                /* In exclude mode, skip all extended/special types (only keep GIT_DIFF_NORMAL) */
+                if (git_type != GIT_DIFF_NORMAL) {
+                    continue;
+                }
+            }
+
             filecount++;
 
             /* If we have a pending file, display it now */

src/patch_common.c

@@ -41,6 +41,7 @@ int strip_output_components = 0; /* --strip */
 int verbose = 0;               /* -v, --verbose */
 int unzip = 0;                 /* -z, --decompress */
 enum git_prefix_mode git_prefix_mode = GIT_PREFIX_KEEP; /* --git-prefixes */
+enum git_extended_diffs_mode git_extended_diffs_mode = GIT_EXTENDED_DIFFS_INCLUDE; /* --git-extended-diffs */
 
 /* Path prefix options */
 char *add_prefix = NULL;         /* --addprefix */
@@ -174,6 +175,15 @@ int parse_common_option(int c, char *optarg)
 	case 1000 + 'N':
 		add_new_prefix = optarg;
 		return 1;
+	case 1000 + 'D':
+		if (!strcmp(optarg, "exclude")) {
+			git_extended_diffs_mode = GIT_EXTENDED_DIFFS_EXCLUDE;
+		} else if (!strcmp(optarg, "include")) {
+			git_extended_diffs_mode = GIT_EXTENDED_DIFFS_INCLUDE;
+		} else {
+			error(EXIT_FAILURE, 0, "invalid argument to --git-extended-diffs: %s (expected 'exclude' or 'include')", optarg);
+		}
+		return 1;
 	}
 
 	return 0; /* Not handled */
@@ -190,6 +200,7 @@ void init_common_options(void)
 	verbose = 0;
 	unzip = 0;
 	git_prefix_mode = GIT_PREFIX_KEEP;
+	git_extended_diffs_mode = GIT_EXTENDED_DIFFS_INCLUDE;
 	add_prefix = NULL;
 	add_old_prefix = NULL;
 	add_new_prefix = NULL;
@@ -233,6 +244,7 @@ void add_common_long_options(struct option *options, int *next_index)
 	options[idx++] = (struct option){"verbose", 0, 0, 'v'};
 	options[idx++] = (struct option){"decompress", 0, 0, 'z'};
 	options[idx++] = (struct option){"git-prefixes", 1, 0, 1000 + 'G'};
+	options[idx++] = (struct option){"git-extended-diffs", 1, 0, 1000 + 'D'};
 	options[idx++] = (struct option){"strip", 1, 0, 1000 + 'S'};
 	options[idx++] = (struct option){"addprefix", 1, 0, 1000 + 'A'};
 	options[idx++] = (struct option){"addoldprefix", 1, 0, 1000 + 'O'};

src/patch_common.h

@@ -32,6 +32,13 @@ extern int verbose;               /* -v, --verbose */
 extern int unzip;                 /* -z, --decompress */
 extern enum git_prefix_mode git_prefix_mode; /* --git-prefixes */
 
+/* Git extended diffs mode */
+enum git_extended_diffs_mode {
+	GIT_EXTENDED_DIFFS_EXCLUDE = 0,  /* Skip extended diffs */
+	GIT_EXTENDED_DIFFS_INCLUDE = 1   /* Process extended diffs (default) */
+};
+extern enum git_extended_diffs_mode git_extended_diffs_mode; /* --git-extended-diffs */
+
 /* Path prefix options */
 extern char *add_prefix;         /* --addprefix */
 extern char *add_old_prefix;     /* --addoldprefix */
@@ -62,7 +69,7 @@ void init_common_options(void);
 void cleanup_common_options(void);
 
 /* Common option parsing helpers */
-#define MAX_COMMON_OPTIONS 16
+#define MAX_COMMON_OPTIONS 20
 #define MAX_TOOL_OPTIONS 16  /* Generous space for tool-specific options */
 #define MAX_TOTAL_OPTIONS (MAX_COMMON_OPTIONS + MAX_TOOL_OPTIONS)
 

tests/filterdiff-binary-filtering/run-test

@@ -26,7 +26,8 @@ Binary files /dev/null and b/file2.bin differ
 EOF
 
 # Test -F2: should only show file #2 (file1.bin), NOT file2.bin
-${FILTERDIFF} -F2 diff 2>errors >output || exit 1
+# Note: using --git-extended-diffs=include to test binary file filtering
+${FILTERDIFF} --git-extended-diffs=include -F2 diff 2>errors >output || exit 1
 [ -s errors ] && exit 1
 
 cat << 'EOF' | cmp - output || exit 1

tests/git-binary-formats/run-test

@@ -62,7 +62,7 @@ EOF
 
 # Test filtering binary files with GIT binary patch format - should include binary content
 echo "Testing GIT binary patch format (include)..."
-${FILTERDIFF} --git-prefixes=strip -i "file1.bin" git-binary-patch.patch 2>errors1 >result1 || exit 1
+${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "file1.bin" git-binary-patch.patch 2>errors1 >result1 || exit 1
 [ -s errors1 ] && { echo "Unexpected errors in test 1:"; cat errors1; exit 1; }
 
 cat << 'EOF' | cmp - result1 || { echo "Test 1 failed"; exit 1; }
@@ -78,7 +78,7 @@ EOF
 
 # Test filtering binary files with literal format - should include binary content
 echo "Testing literal format (include)..."
-${FILTERDIFF} --git-prefixes=strip -i "file3.bin" literal-patch.patch 2>errors2 >result2 || exit 1
+${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "file3.bin" literal-patch.patch 2>errors2 >result2 || exit 1
 [ -s errors2 ] && { echo "Unexpected errors in test 2:"; cat errors2; exit 1; }
 
 cat << 'EOF' | cmp - result2 || { echo "Test 2 failed"; exit 1; }
@@ -93,7 +93,7 @@ EOF
 
 # Test filtering binary files with delta format - should include binary content
 echo "Testing delta format (include)..."
-${FILTERDIFF} --git-prefixes=strip -i "file5.bin" delta-patch.patch 2>errors3 >result3 || exit 1
+${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -i "file5.bin" delta-patch.patch 2>errors3 >result3 || exit 1
 [ -s errors3 ] && { echo "Unexpected errors in test 3:"; cat errors3; exit 1; }
 
 cat << 'EOF' | cmp - result3 || { echo "Test 3 failed"; exit 1; }
@@ -108,7 +108,7 @@ EOF
 
 # Test excluding binary files - should skip binary content
 echo "Testing binary patch exclusion..."
-${FILTERDIFF} --git-prefixes=strip -x "file1.bin" git-binary-patch.patch 2>errors4 >result4 || exit 1
+${FILTERDIFF} --git-extended-diffs=include --git-prefixes=strip -x "file1.bin" git-binary-patch.patch 2>errors4 >result4 || exit 1
 [ -s errors4 ] && { echo "Unexpected errors in test 4:"; cat errors4; exit 1; }
 
 cat << 'EOF' | cmp - result4 || { echo "Test 4 failed"; exit 1; }