Commit Diff

Commit:
dc082d4a7ad5857602ab64aaea1f836ce47b689b
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
in merge_file(), remove allocation of a base_path which is unused
Actions:
Patch | Tree
commit - 07bb0f933a402d7387f7dd360060c55cdd1b56c0
commit + dc082d4a7ad5857602ab64aaea1f836ce47b689b
blob - 1c5356b3146719d66e0fedf0462ef11cc9f1c61f
blob + 12aa78911429fdc83d9687a9b65a66678594b1c6
--- lib/worktree.c
+++ lib/worktree.c
@@ -803,13 +803,6 @@ merge_file(int *local_changes_subsumed, struct got_wor
 		ssize_t target_len;
 		size_t n;
 
-		free(base_path);
-		if (asprintf(&base_path, "%s/got-symlink-merge",
-		    parent) == -1) {
-			err = got_error_from_errno("asprintf");
-			base_path = NULL;
-			goto done;
-		}
 		f = got_opentemp();
 		if (f == NULL) {
 			err = got_error_from_errno("got_opentemp");