Commit Diff

Commit:
6f12304beddfa5b5c90fe733397f63a3e7432d75
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
got: don't leave tmp "got-logmsg-*" files in the work tree Reported by stsp on irc, and reviewed as part of the following regress commit covering the commit aspect of logmsg refs. Delete temp merge_log files if created during commits involving backed-out/cherrypicked changes. ok stsp@
Actions:
Patch | Tree
commit - 414c3236cf1d6213d1377c0691908380c6761bc2
commit + 6f12304beddfa5b5c90fe733397f63a3e7432d75
blob - 0400c0dc5db068066471e6f4bc56718144e4f0e3
blob + abb9d74080d4e2fa0d17b4bc6d3c69691b3fdb2f
--- got/got.c
+++ got/got.c
@@ -9203,6 +9203,9 @@ done:
 	    error == NULL)
 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
 	free(cl_arg.logmsg_path);
+	if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
+		error = got_error_from_errno2("unlink", merged_logmsg);
+	free(merged_logmsg);
 	if (repo) {
 		const struct got_error *close_err = got_repo_close(repo);
 		if (error == NULL)