undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display 'theirs' branch name when possible in merge.

Browse Source 
Displaying the SHA1 of 'their' branch (the branch being merged into
the current branch) is not nearly as friendly as just displaying
the name of that branch, especially if that branch is already local
to this repository.

git-merge now sets the environment variable 'GITHEAD_%(sha1)=%(name)'
for each argument it gets passed, making the actual input name that
resolved to the commit '%(sha1)' easily available to the invoked
merge strategy.

git-merge-recursive makes use of these environment variables when
they are available by using '%(name)' whenever it outputs the commit
identification rather than '%(sha1)'.  This is most obvious in the
conflict hunks created by xdl_merge:

  $ git mege sideb~1
  <<<<<<< HEAD:INSTALL
     Good!
  =======
     Oops.
  >>>>>>> sideb~1:INSTALL

[jc: adjusted a test script and a minor constness glitch.]

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-23 03:44:47 -05:00 committed by Junio C Hamano
parent d9606e85cd
commit e0ec18192d
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -221,6 +221,8 @@ do
remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) || remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
die "$remote - not something we can merge" die "$remote - not something we can merge"
remoteheads="${remoteheads}$remotehead " remoteheads="${remoteheads}$remotehead "
eval GITHEAD_$remotehead='"$remote"'
export GITHEAD_$remotehead
done done
set x $remoteheads ; shift set x $remoteheads ; shift

17
merge-recursive.c
View File

@ -1263,6 +1263,18 @@ 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];
@ -1293,11 +1305,14 @@ int main(int argc, char *argv[])
branch1 = argv[++i]; branch1 = argv[++i];
branch2 = argv[++i]; branch2 = argv[++i];
printf("Merging %s with %s\n", branch1, branch2);
h1 = get_ref(branch1); h1 = get_ref(branch1);
h2 = get_ref(branch2); h2 = get_ref(branch2);
branch1 = better_branch_name(branch1);
branch2 = better_branch_name(branch2);
printf("Merging %s with %s\n", branch1, branch2);
if (bases_count == 1) { if (bases_count == 1) {
struct commit *ancestor = get_ref(bases[0]); struct commit *ancestor = get_ref(bases[0]);
clean = merge(h1, h2, branch1, branch2, 0, ancestor, &result); clean = merge(h1, h2, branch1, branch2, 0, ancestor, &result);

6
t/t6024-recursive-merge.sh
View File

@ -59,18 +59,18 @@ GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
test_expect_failure "combined merge conflicts" "git merge -m final G" test_expect_failure "combined merge conflicts" "git merge -m final G"
cat > expect << EOF cat > expect << EOF
<<<<<<< HEAD/a1 <<<<<<< HEAD:a1
F F
======= =======
G G
>>>>>>> 26f86b677eb03d4d956dbe108b29cb77061c1e73/a1 >>>>>>> G:a1
EOF EOF
test_expect_success "result contains a conflict" "diff -u expect a1" test_expect_success "result contains a conflict" "diff -u expect a1"
git ls-files --stage > out git ls-files --stage > out
cat > expect << EOF cat > expect << EOF
100644 f16f906ab60483c100d1241dfc39868de9ec9fcb 1 a1 100644 da056ce14a2241509897fa68bb2b3b6e6194ef9e 1 a1
100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF EOF