Commit Diff

Commit:
3fc0c068476d56f41d2283710e4235623f0a28f2
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
make 'got diff' not show a diff header if work tree has no mods
Actions:
Patch | Tree
commit - 2c201a36298b33cae3e3f1e94d7f30c20ac8d140
commit + 3fc0c068476d56f41d2283710e4235623f0a28f2
blob - a2d01e119868c295646591eff531e132430af603
blob + 38251537f753faed2f94818ddb4bd42c5780eb6d
--- got/got.c
+++ got/got.c
@@ -950,6 +950,8 @@ struct print_diff_arg {
 	struct got_repository *repo;
 	struct got_worktree *worktree;
 	int diff_context;
+	const char *id_str;
+	int header_shown;
 };
 
 static const struct got_error *
@@ -965,6 +967,12 @@ print_diff(void *arg, unsigned char status, const char
 
 	if (status != GOT_STATUS_MODIFY)
 		return NULL;
+
+	if (!a->header_shown) {
+		printf("diff %s %s\n", a->id_str,
+		    got_worktree_get_root_path(a->worktree));
+		a->header_shown = 1;
+	}
 
 	err = got_object_open_as_blob(&blob1, a->repo, id, 8192);
 	if (err)
@@ -1084,9 +1092,9 @@ cmd_diff(int argc, char *argv[])
 		arg.repo = repo;
 		arg.worktree = worktree;
 		arg.diff_context = diff_context;
+		arg.id_str = id_str;
+		arg.header_shown = 0;
 
-		printf("diff %s %s\n", id_str,
-		    got_worktree_get_root_path(worktree));
 		error = got_worktree_status(worktree, repo, print_diff,
 		    &arg, check_cancelled, NULL);
 		free(id_str);