From: Shawn O. Pearce Date: Thu, 28 Dec 2006 07:35:20 GMT Subject: [PATCH 8/11] Move better_branch_name above get_ref in merge-recursive. Message-ID: <20061228073520.GH17867@spearce.org> In-Reply-To: <9847899e4ba836980dbfed6d0ea1c82f31f21456.1167290864.git.spearce@spearce.org> To permit the get_ref function to use the static better_branch_name function to generate a string on demand I'm moving it up earlier. The actual logic was not affected in this change. Signed-off-by: Shawn O. Pearce --- merge-recursive.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index ca4f19e..1c84ed7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1248,6 +1248,18 @@ static int merge(struct commit *h1, return clean; } +static const char *better_branch_name(const char *branch) +{ + static char githead_env[8 + 40 + 1]; + char *name; + + if (strlen(branch) != 40) + return branch; + sprintf(githead_env, "GITHEAD_%s", branch); + name = getenv(githead_env); + return name ? name : branch; +} + static struct commit *get_ref(const char *ref) { unsigned char sha1[20]; @@ -1263,18 +1275,6 @@ static struct commit *get_ref(const char *ref) return (struct commit *)object; } -static const char *better_branch_name(const char *branch) -{ - static char githead_env[8 + 40 + 1]; - char *name; - - if (strlen(branch) != 40) - return branch; - sprintf(githead_env, "GITHEAD_%s", branch); - name = getenv(githead_env); - return name ? name : branch; -} - int main(int argc, char *argv[]) { static const char *bases[2]; -- 1.4.4.3.gd2e4