{"thread":{"id":"5020","subject":"[PATCH 3/6] merge-recur: Remove dead code","startedAt":"2006-07-27T17:13:08Z","lastAt":"2006-07-27T17:13:08Z","messageCount":1,"participants":["Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"24227","messageId":"Pine.LNX.4.63.0607271912580.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"5020","inReplyTo":null,"subject":"[PATCH 3/6] merge-recur: Remove dead code","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-07-27T17:13:08Z","receivedAt":"2006-07-27T17:13:08Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSigned-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>\n---\n merge-recursive.c |   22 ----------------------\n 1 files changed, 0 insertions(+), 22 deletions(-)\n\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 8d9451f..9a86cdb 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -197,11 +197,6 @@ static int index_only = 0;\n  */\n static int git_read_tree(const struct tree *tree)\n {\n-#if 0\n-\tfprintf(stderr, \"GIT_INDEX_FILE='%s' git-read-tree %s\\n\",\n-\t\tgetenv(\"GIT_INDEX_FILE\"),\n-\t\tsha1_to_hex(tree->object.sha1));\n-#endif\n \tint rc;\n \tconst char *argv[] = { \"git-read-tree\", NULL, NULL, };\n \tif (cache_dirty)\n@@ -219,14 +214,6 @@ static int git_merge_trees(const char *u\n \t\t\t   struct tree *head,\n \t\t\t   struct tree *merge)\n {\n-#if 0\n-\tfprintf(stderr, \"GIT_INDEX_FILE='%s' git-read-tree %s -m %s %s %s\\n\",\n-\t\tgetenv(\"GIT_INDEX_FILE\"),\n-\t\tupdate_arg,\n-\t\tsha1_to_hex(common->object.sha1),\n-\t\tsha1_to_hex(head->object.sha1),\n-\t\tsha1_to_hex(merge->object.sha1));\n-#endif\n \tint rc;\n \tconst char *argv[] = {\n \t\t\"git-read-tree\", NULL, \"-m\", NULL, NULL, NULL,\n@@ -247,10 +234,6 @@ #endif\n  */\n static struct tree *git_write_tree(void)\n {\n-#if 0\n-\tfprintf(stderr, \"GIT_INDEX_FILE='%s' git-write-tree\\n\",\n-\t\tgetenv(\"GIT_INDEX_FILE\"));\n-#endif\n \tFILE *fp;\n \tint rc;\n \tchar buf[41];\n@@ -672,11 +655,6 @@ static struct merge_file_info merge_file\n \t\t\targv[6] = lb = strdup(mkpath(\"%s/%s\", branch2Name, b->path));\n \t\t\targv[4] = lo = strdup(mkpath(\"orig/%s\", o->path));\n \n-#if 0\n-\t\t\tprintf(\"%s %s %s %s %s %s %s %s %s %s\\n\",\n-\t\t\t       argv[0], argv[1], argv[2], argv[3], argv[4],\n-\t\t\t       argv[5], argv[6], argv[7], argv[8], argv[9]);\n-#endif\n \t\t\tcode = run_command_v(10, argv);\n \n \t\t\tfree(la);\n-- \n1.4.2.rc2.g6a4e\n"}]}