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

get_sha1: teach ":$n:<path>" the same relative path logic

Browse Source 
We taught the object name parser to take ":./<path>", ":../<path>", etc.
and understand them to be relative to the current working directory.

Given that ":<path>" is just a short-hand for ":0:<path>" (i.e. "take
stage #0 of that path"), we should allow ":$n:<path>" to interpret them
the same way.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2010-12-09 13:38:05 -08:00
parent 979f792951
commit 3d6e0f745e
2 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sha1_name.c
View File

@ -1091,17 +1091,19 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
return get_sha1_oneline(name + 2, sha1); return get_sha1_oneline(name + 2, sha1);
if (namelen < 3 || if (namelen < 3 ||
name[2] != ':' || name[2] != ':' ||
name[1] < '0' || '3' < name[1]) { name[1] < '0' || '3' < name[1])
cp = name + 1; cp = name + 1;
new_path = resolve_relative_path(cp);
if (new_path)
cp = new_path;
}
else { else {
stage = name[1] - '0'; stage = name[1] - '0';
cp = name + 3; cp = name + 3;
} }
namelen = strlen(cp); new_path = resolve_relative_path(cp);
if (!new_path) {
namelen = namelen - (cp - name);
} else {
cp = new_path;
namelen = strlen(cp);
}
strncpy(oc->path, cp, strncpy(oc->path, cp,
sizeof(oc->path)); sizeof(oc->path));

24
t/t1506-rev-parse-diagnosis.sh
View File

@ -34,6 +34,8 @@ test_expect_success 'correct file objects' '
test_expect_success 'correct relative file objects (0)' ' test_expect_success 'correct relative file objects (0)' '
git rev-parse :file.txt >expected && git rev-parse :file.txt >expected &&
git rev-parse :./file.txt >result && git rev-parse :./file.txt >result &&
test_cmp expected result &&
git rev-parse :0:./file.txt >result &&
test_cmp expected result test_cmp expected result
' '
@ -68,6 +70,28 @@ test_expect_success 'correct relative file objects (4)' '
) )
' '
test_expect_success 'correct relative file objects (5)' '
git rev-parse :subdir/file.txt >expected &&
(
cd subdir &&
git rev-parse :./file.txt >result &&
test_cmp ../expected result &&
git rev-parse :0:./file.txt >result &&
test_cmp ../expected result
)
'
test_expect_success 'correct relative file objects (6)' '
git rev-parse :file.txt >expected &&
(
cd subdir &&
git rev-parse :../file.txt >result &&
test_cmp ../expected result &&
git rev-parse :0:../file.txt >result &&
test_cmp ../expected result
)
'
test_expect_success 'incorrect revision id' ' test_expect_success 'incorrect revision id' '
test_must_fail git rev-parse foobar:file.txt 2>error && test_must_fail git rev-parse foobar:file.txt 2>error &&
grep "Invalid object name '"'"'foobar'"'"'." error && grep "Invalid object name '"'"'foobar'"'"'." error &&