git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Shawn O. Pearce" <spearce@spearce.org>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH 1/4] Remove unnecessary call_depth parameter in merge-recursive.
Date: Sun, 14 Jan 2007 17:44:57 -0500	[thread overview]
Message-ID: <20070114224457.GB10888@spearce.org> (raw)
In-Reply-To: <20070114193503.GB2378@steel.home>

Alex Riesen <fork0@t-online.de> wrote:
> Shawn O. Pearce, Sun, Jan 14, 2007 06:28:33 +0100:
> > Because the output_indent always matches the call_depth value
> > there is no reason to pass around the call_depth to the merge
> > function during each recursive invocation.
> 
> Actually, you removed output_indent, not call_depth.

Yeaaaaa.  That happened because I amended the commit.  The first
version of it kept output_indent and replaced all call_depth with
output_indent.  I was then going to do another patch to rename
output_indent -> call_depth, but I noticed the patch would be
about the same size as that one and would affect the same lines,
so I just amended it.  Then I didn't edit the commit message.

-- 
Shawn.

      reply	other threads:[~2007-01-15 17:21 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-14  5:28 [PATCH 1/4] Remove unnecessary call_depth parameter in merge-recursive Shawn O. Pearce
2007-01-14 19:35 ` Alex Riesen
2007-01-14 22:44   ` Shawn O. Pearce [this message]

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=20070114224457.GB10888@spearce.org \
    --to=spearce@spearce.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=raa.lkml@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).