summaryrefslogtreecommitdiff
path: root/builtin-merge-tree.c
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2010-01-22 11:47:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-22 18:01:06 (GMT)
commit07c073206798483c9916d492dfc6faf7400a50ad (patch)
tree63507d56941c095c9a6e01fb557f515cfd809c94 /builtin-merge-tree.c
parentdedc0ec5d778214528dae3bddf60d77cfcde4bd4 (diff)
downloadgit-07c073206798483c9916d492dfc6faf7400a50ad.zip
git-07c073206798483c9916d492dfc6faf7400a50ad.tar.gz
git-07c073206798483c9916d492dfc6faf7400a50ad.tar.bz2
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>
Diffstat (limited to 'builtin-merge-tree.c')
-rw-r--r--builtin-merge-tree.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin-merge-tree.c b/builtin-merge-tree.c
index 8e16c3e..a4a4f2c 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]);