@matheusbsbs / matheus-bagliano / commits / 5d3afe05d9
Fork 0

merge-recur: Remove dead code

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>

Johannes Schindelin committed Jul 27, 2006 at 19:13 UTC 5d3afe05d9466a8472be315793dfc08594b1e9c4
1 file changed -22
merge-recursive.c
-22
@@ -197,11 +197,6 @@ static int index_only = 0;
197 */
198 static int git_read_tree(const struct tree *tree)
199 {
200 -#if 0
201 - fprintf(stderr, "GIT_INDEX_FILE='%s' git-read-tree %s\n",
202 - getenv("GIT_INDEX_FILE"),
203 - sha1_to_hex(tree->object.sha1));
204 -#endif
200 int rc;
201 const char *argv[] = { "git-read-tree", NULL, NULL, };
202 if (cache_dirty)
@@ -219,14 +214,6 @@ static int git_merge_trees(const char *update_arg,
214 struct tree *head,
215 struct tree *merge)
216 {
222 -#if 0
223 - fprintf(stderr, "GIT_INDEX_FILE='%s' git-read-tree %s -m %s %s %s\n",
224 - getenv("GIT_INDEX_FILE"),
225 - update_arg,
226 - sha1_to_hex(common->object.sha1),
227 - sha1_to_hex(head->object.sha1),
228 - sha1_to_hex(merge->object.sha1));
229 -#endif
217 int rc;
218 const char *argv[] = {
219 "git-read-tree", NULL, "-m", NULL, NULL, NULL,
@@ -247,10 +234,6 @@ static int git_merge_trees(const char *update_arg,
234 */
235 static struct tree *git_write_tree(void)
236 {
250 -#if 0
251 - fprintf(stderr, "GIT_INDEX_FILE='%s' git-write-tree\n",
252 - getenv("GIT_INDEX_FILE"));
253 -#endif
237 FILE *fp;
238 int rc;
239 char buf[41];
@@ -672,11 +655,6 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
655 argv[6] = lb = strdup(mkpath("%s/%s", branch2Name, b->path));
656 argv[4] = lo = strdup(mkpath("orig/%s", o->path));
657
675 -#if 0
676 - printf("%s %s %s %s %s %s %s %s %s %s\n",
677 - argv[0], argv[1], argv[2], argv[3], argv[4],
678 - argv[5], argv[6], argv[7], argv[8], argv[9]);
679 -#endif
658 code = run_command_v(10, argv);
659
660 free(la);