mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-24 04:20:53 +02:00
Code

[PATCH] Make sure git-resolve-script always works on commits

Browse Source 
You can resolve a tag, and it does the right thing except that it might
end up writing the tag itself into the resulting HEAD, which will confuse
subsequent operations no end.

This makes sure that when we resolve two heads, we will have turned them
into proper commits before we start acting on them.

This also fixes the parsing of "treeish^0", which would incorrectly
resolve to "treeish" instead of causing an error.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2005-08-13 10:50:56 -07:00 committed by Junio C Hamano
parent 3140825124
commit 02a4a32c2d
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-resolve-script
View File

@ -6,8 +6,8 @@
#
. git-sh-setup-script || die "Not a git archive"
head=$(git-rev-parse --verify "$1")
merge=$(git-rev-parse --verify "$2")
head=$(git-rev-parse --verify "$1"^0) || exit
merge=$(git-rev-parse --verify "$2"^0) || exit
merge_msg="$3"
dropheads() {

10
sha1_name.c
View File

@ -208,13 +208,9 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1)
} else
parent = -1;
if (0 <= parent) {
ret = get_parent(name, len, sha1, parent);
if (!ret)
return 0;
else if(parent>0)
return ret;
}
if (parent >= 0)
return get_parent(name, len, sha1, parent);
ret = get_sha1_basic(name, len, sha1);
if (!ret)
return 0;