commit 119f86008e60f53160896ee4658c9d16c7a5f13a
from: Stefan Sperling <stsp@stsp.name>
date: Mon Apr 02 18:49:11 2018 UTC

remove support for "normal" diff output from diffreg

commit - 84e118513c1ae7e7793fc4e8553f4b06dbb53ec7
commit + 119f86008e60f53160896ee4658c9d16c7a5f13a
blob - 11213b4d983acf488a2529ee31ea89f2ffed55ab
blob + 0cac8dc70cf7ad2a27acf92abe2ce5effb3a5011
--- lib/diffreg.c
+++ lib/diffreg.c
@@ -1002,12 +1002,9 @@ restart:
 	switch (args->diff_format) {
 	case D_BRIEF:
 		return (0);
-	case D_NORMAL:
 	case D_EDIT:
 		range(outfile, a, b, ",");
 		diff_output(outfile, "%c", a > b ? 'a' : c > d ? 'd' : 'c');
-		if (args->diff_format == D_NORMAL)
-			range(outfile, c, d, ",");
 		diff_output(outfile, "\n");
 		break;
 	case D_REVERSE:
@@ -1026,12 +1023,9 @@ restart:
 		}
 		break;
 	}
-	if (args->diff_format == D_NORMAL || args->diff_format == D_IFDEF) {
+	if (args->diff_format == D_IFDEF)
 		fetch(outfile, ds, args, ds->ixold, a, b, f1, '<', 1, *pflags);
-		if (a <= b && c <= d && args->diff_format == D_NORMAL)
-			diff_output(outfile, "---\n");
-	}
-	i = fetch(outfile, ds, args, ds->ixnew, c, d, f2, args->diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
+	i = fetch(outfile, ds, args, ds->ixnew, c, d, f2, '\0', 0, *pflags);
 	if (i != 0 && args->diff_format == D_EDIT) {
 		/*
 		 * A non-zero return value for D_EDIT indicates that the
@@ -1093,8 +1087,7 @@ fetch(FILE *outfile, struct got_diff_state *ds, struct
 		nc = f[i] - f[i - 1];
 		if (args->diff_format != D_IFDEF && ch != '\0') {
 			diff_output(outfile, "%c", ch);
-			if (args->Tflag && (args->diff_format == D_NORMAL ||
-			    args->diff_format == D_UNIFIED))
+			if (args->Tflag && args->diff_format == D_UNIFIED)
 				diff_output(outfile, "\t");
 			else if (args->diff_format != D_UNIFIED)
 				diff_output(outfile, " ");
blob - addc67c7382d9ac533adad0c5be847b958b3416e
blob + 1d375ea873804e20721c9034934a7f3aa4acd858
--- lib/got_lib_diff.h
+++ lib/got_lib_diff.h
@@ -37,7 +37,6 @@
 /*
  * Output format options
  */
-#define	D_NORMAL	0	/* Normal output */
 #define	D_EDIT		-1	/* Editor script out */
 #define	D_REVERSE	1	/* Reverse editor script */
 #define	D_UNIFIED	3	/* Unified context diff */