git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] merge-recursive: Remove miss leading comment

From
Stefan Beller <stefanbeller@gmail.com>
Date
Sep 23, 2014, 14:55 UTC
Message-ID
<1411484150-18025-1-git-send-email-stefanbeller@gmail.com>
In-Reply-To
<1411332586-18275-1-git-send-email-stefanbeller@gmail.com>
Commented code, which doesn't even compile, is of no use any more?
Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
---
To be applied on top of sb/merge-recursive-copy-paste-fix
 merge-recursive.c | 4 ----
 1 file changed, 4 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index d63524c..8ad4be8 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1686,10 +1686,6 @@ static int merge_content(struct merge_options *o,
 static int process_entry(struct merge_options *o,
 			 const char *path, struct stage_data *entry)
 {
-	/*
-	printf("processing entry, clean cache: %s\n", index_only ? "yes": "no");
-	print_index_entry("\tpath: ", entry);
-	*/
 	int clean_merge = 1;
 	int normalize = o->renormalize;
 	unsigned o_mode = entry->stages[1].mode;
-- 
2.1.0.238.gce1d3a9
Previous: Stefan BellerNext: Junio C Hamano
Message 2 of 4 in “merge-recursive: Fix copy-paste mistake”
  1. merge-recursive: Fix copy-paste mistakeStefan Beller, Sep 21, 2014
  2. merge-recursive: Remove miss leading commentStefan Beller, Sep 23, 2014
  3. Junio C HamanoSep 23, 2014
  4. Stefan BellerSep 24, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.