kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jc/maint-checkout-index-to-prefix' 

* jc/maint-checkout-index-to-prefix:
  check_path(): allow symlinked directories to checkout-index --prefix
maint
Junio C Hamano 2009-08-25 14:47:56 -07:00
parent 079f298513 da02ca508b
commit 3613339eaf
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cache.h
View File

@ -469,7 +469,7 @@ extern int index_path(unsigned char *sha1, const char *path, struct stat *st, in
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);


/* "careful lstat()" */ /* "careful lstat()" */
extern int check_path(const char *path, int len, struct stat *st); extern int check_path(const char *path, int len, struct stat *st, int skiplen);


#define REFRESH_REALLY 0x0001 /* ignore_valid */ #define REFRESH_REALLY 0x0001 /* ignore_valid */
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */ #define REFRESH_UNMERGED 0x0002 /* allow unmerged */

12
entry.c
View File

@ -177,11 +177,15 @@ static int write_entry(struct cache_entry *ce, char *path, const struct checkout


/* /*
* This is like 'lstat()', except it refuses to follow symlinks * This is like 'lstat()', except it refuses to follow symlinks
* in the path. * in the path, after skipping "skiplen".
*/ */
int check_path(const char *path, int len, struct stat *st) int check_path(const char *path, int len, struct stat *st, int skiplen)
{ {
if (has_symlink_leading_path(path, len)) { const char *slash = path + len;

while (path < slash && *slash != '/')
slash--;
if (!has_dirs_only_path(path, slash - path, skiplen)) {
errno = ENOENT; errno = ENOENT;
return -1; return -1;
} }
@ -201,7 +205,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
strcpy(path + len, ce->name); strcpy(path + len, ce->name);
len += ce_namelen(ce); len += ce_namelen(ce);


if (!check_path(path, len, &st)) { if (!check_path(path, len, &st, state->base_dir_len)) {
unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID); unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID);
if (!changed) if (!changed)
return 0; return 0;

9
t/t2000-checkout-cache-clash.sh
View File

@ -48,4 +48,13 @@ test_expect_success \
'git checkout-index conflicting paths.' \ 'git checkout-index conflicting paths.' \
'test -f path0 && test -d path1 && test -f path1/file1' 'test -f path0 && test -d path1 && test -f path1/file1'


test_expect_success SYMLINKS 'checkout-index -f twice with --prefix' '
mkdir -p tar/get &&
ln -s tar/get there &&
echo first &&
git checkout-index -a -f --prefix=there/ &&
echo second &&
git checkout-index -a -f --prefix=there/
'

test_done test_done