commit 70a0c8ec6e6b62f44cf81a937107e64429ee5572
from: Stefan Sperling <stsp@stsp.name>
date: Wed Feb 20 09:35:33 2019 UTC

preserve permissions on merged files

commit - 2a57020b374709058c3f812c2672f8f367ea46fa
commit + 70a0c8ec6e6b62f44cf81a937107e64429ee5572
blob - 22ee00ac8d3a6c06298d8e7c068f0d270f3c7c4a
blob + f562feb7a7cf4e2dd35c901cfb0609510f5d442b
--- lib/worktree.c
+++ lib/worktree.c
@@ -793,6 +793,11 @@ merge_blob(struct got_worktree *worktree, struct got_f
 			goto done;
 	}
 
+	if (chmod(merged_path, st_mode) != 0) {
+		err = got_error_from_errno();
+		goto done;
+	}
+
 	if (rename(merged_path, ondisk_path) != 0) {
 		err = got_error_from_errno();
 		unlink(merged_path);