mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move better_branch_name above get_ref in merge-recursive.

Browse Source 
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 <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce
2006-12-28 02:35:20 -05:00
committed by Junio C Hamano
parent eff73751bb
commit 7ba3c078c7
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
merge-recursive.c
View File

@ -1248,6 +1248,18 @@ static int merge(struct commit *h1,
return clean; 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) static struct commit *get_ref(const char *ref)
{ {
unsigned char sha1[20]; unsigned char sha1[20];
@ -1263,18 +1275,6 @@ static struct commit *get_ref(const char *ref)
return (struct commit *)object; 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[]) int main(int argc, char *argv[])
{ {
static const char *bases[2]; static const char *bases[2];