From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 22 Jan 2010 11:47:59 +0000 (+0100)
Subject: merge-tree: remove unnecessary call of git_extract_argv0_path
X-Git-Tag: v1.7.0-rc0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=07c073206798483c9916d492dfc6faf7400a50ad;p=git.git

merge-tree: remove unnecessary call of git_extract_argv0_path

This call should have been removed when the utility was made a builtin by
907a7cb.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-merge-tree.c b/builtin-merge-tree.c
index 8e16c3eda..a4a4f2ce4 100644
--- a/builtin-merge-tree.c
+++ b/builtin-merge-tree.c
@@ -345,8 +345,6 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
 	if (argc != 4)
 		usage(merge_tree_usage);
 
-	git_extract_argv0_path(argv[0]);
-
 	buf1 = get_tree_descriptor(t+0, argv[1]);
 	buf2 = get_tree_descriptor(t+1, argv[2]);
 	buf3 = get_tree_descriptor(t+2, argv[3]);