global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 12:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nd/extended-sha1-relpath' into next

Browse Source 
* nd/extended-sha1-relpath:
  get_sha1: teach ":$n:<path>" the same relative path logic
This commit is contained in:
Junio C Hamano
2010-12-10 16:40:54 -08:00
parent edd0bf0e86 3d6e0f745e
commit 0018aa6bc5
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sha1_name.c
View File

@@ -1112,17 +1112,19 @@ int get_sha1_with_context_1(const char *name, unsigned char *sha1,
return get_sha1_oneline(name + 2, sha1);
if (namelen < 3 ||
name[2] != ':' ||
name[1] < '0' || '3' < name[1]) {
name[1] < '0' || '3' < name[1])
cp = name + 1;
new_path = resolve_relative_path(cp);
if (new_path)
cp = new_path;
}
else {
stage = name[1] - '0';
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,
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)' '
git rev-parse :file.txt >expected &&
git rev-parse :./file.txt >result &&
test_cmp expected result &&
git rev-parse :0:./file.txt >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_must_fail git rev-parse foobar:file.txt 2>error &&
grep "Invalid object name '"'"'foobar'"'"'." error &&