X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fmerge-tree.c;h=9b25ddc9794efe489ee9ec9fd3203ffa997f03f7;hb=385cc9d8c44eb5be9d57e630129752a72c0a08c8;hp=fc00d794d641c146023a78d7d8e4143f0fdac302;hpb=6cd52edbbd9acc7797cffeba1b849538285ed558;p=git.git

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index fc00d794d..9b25ddc97 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -60,6 +60,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
 {
 	enum object_type type;
 	struct blob *base, *our, *their;
+	const char *path = entry->path;
 
 	if (!entry->stage)
 		return read_sha1_file(entry->blob->object.sha1, &type, size);
@@ -76,7 +77,7 @@ static void *result(struct merge_list *entry, unsigned long *size)
 	their = NULL;
 	if (entry)
 		their = entry->blob;
-	return merge_file(entry->path, base, our, their, size);
+	return merge_file(path, base, our, their, size);
 }
 
 static void *origin(struct merge_list *entry, unsigned long *size)