All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <stefanbeller@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: Remove miss leading comment
Date: Tue, 23 Sep 2014 11:31:38 -0700	[thread overview]
Message-ID: <xmqq7g0ujiid.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1411484150-18025-1-git-send-email-stefanbeller@gmail.com> (Stefan Beller's message of "Tue, 23 Sep 2014 16:55:50 +0200")

Stefan Beller <stefanbeller@gmail.com> writes:

> Commented code, which doesn't even compile, is of no use any more?

Apparently that is meant to help debugging the code.  An alternative
would be to make it usable again, but removal is fine by me as well.

>
> 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;

  reply	other threads:[~2014-09-23 18:31 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-21 20:49 [PATCH] merge-recursive: Fix copy-paste mistake Stefan Beller
2014-09-23 14:55 ` [PATCH] merge-recursive: Remove miss leading comment Stefan Beller
2014-09-23 18:31   ` Junio C Hamano [this message]
2014-09-24 12:52 ` [PATCH] merge-recursive: Fix copy-paste mistake Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq7g0ujiid.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=stefanbeller@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.