commit f3ad4b0a2ba1fd3f0c3f54b3f506585b0570d1b1
from: Josiah Frentsos <jfrent@tilde.team>
via: Thomas Adam <thomas@xteddy.org>
date: Sat Jan 07 15:21:02 2023 UTC

add -d switch to log usage and sort lexicographically

patch by Josiah Frentsos

commit - 8d5e51600db687f15110fd0b7c1b044fe8c33b90
commit + f3ad4b0a2ba1fd3f0c3f54b3f506585b0570d1b1
blob - d7f14e7606560bbef80113d081dca440bc8ef372
blob + 4a617a41b7073d575cc264c085ff352daa38f63c
--- got/got.1
+++ got/got.1
@@ -787,7 +787,7 @@ and gives no special significance to the location of p
 in a pattern.
 .It Xo
 .Cm log
-.Op Fl bPpRs
+.Op Fl bdPpRs
 .Op Fl C Ar number
 .Op Fl c Ar commit
 .Op Fl l Ar N
blob - 9fa74a59313e1d506d15230e589b6ca84fdea580
blob + 8669268b5e3483ebf2b5a00490e7fe5fccd0cece
--- got/got.c
+++ got/got.c
@@ -4449,9 +4449,9 @@ done:
 __dead static void
 usage_log(void)
 {
-	fprintf(stderr, "usage: %s log [-bPpRs] [-C number] [-c commit] [-l N] "
-	    "[-r repository-path] [-S search-pattern] [-x commit] [path]\n",
-	    getprogname());
+	fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
+	    "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
+	    "[path]\n", getprogname());
 	exit(1);
 }
 
@@ -4512,13 +4512,13 @@ cmd_log(int argc, char *argv[])
 			if (errstr != NULL)
 				errx(1, "number of context lines is %s: %s",
 				    errstr, optarg);
-			break;
-		case 'd':
-			show_diffstat = 1;
 			break;
 		case 'c':
 			start_commit = optarg;
 			break;
+		case 'd':
+			show_diffstat = 1;
+			break;
 		case 'l':
 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
 			if (errstr != NULL)