Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
merge: do not setup worktree twice
author
Jonathan Nieder
<jrnieder@gmail.com>
Mon, 9 Nov 2009 15:04:58 +0000
(09:04 -0600)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 10 Nov 2009 18:50:19 +0000
(10:50 -0800)
Builtins do not need to run setup_worktree() for themselves, since
the builtin machinery runs it for them.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
6586b1f
)
diff --git
a/builtin-merge.c
b/builtin-merge.c
index b6b84286b26a4317dfd5185ae83fd861c6f9fa7d..e95c5dc71746fb6f4e87913669701a2f65070602 100644
(file)
--- a/
builtin-merge.c
+++ b/
builtin-merge.c
@@
-840,7
+840,6
@@
int cmd_merge(int argc, const char **argv, const char *prefix)
const char *best_strategy = NULL, *wt_strategy = NULL;
struct commit_list **remotes = &remoteheads;
- setup_work_tree();
if (file_exists(git_path("MERGE_HEAD")))
die("You have not concluded your merge. (MERGE_HEAD exists)");
if (read_cache_unmerged())