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

rename_ref: use lstat(2) when testing for symlink 

The current check for symlinked reflogs was based on stat(2), which is
utterly embarrassing.

Fix it, and add a matching testcase.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Lars Hjemli 2006-11-29 21:44:56 +01:00 committed by Junio C Hamano
parent c976d415e5
commit 16c2bfbb44
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refs.c
View File

@ -792,7 +792,7 @@ int rename_ref(const char *oldref, const char *newref)
struct ref_lock *lock; struct ref_lock *lock;
char msg[PATH_MAX*2 + 100]; char msg[PATH_MAX*2 + 100];
struct stat loginfo; struct stat loginfo;
int log = !stat(git_path("logs/%s", oldref), &loginfo); int log = !lstat(git_path("logs/%s", oldref), &loginfo);


if (S_ISLNK(loginfo.st_mode)) if (S_ISLNK(loginfo.st_mode))
return error("reflog for %s is a symlink", oldref); return error("reflog for %s is a symlink", oldref);

7
t/t3200-branch.sh
View File

@ -104,4 +104,11 @@ test_expect_success \
git-branch -m s/s s && git-branch -m s/s s &&
test -f .git/logs/refs/heads/s' test -f .git/logs/refs/heads/s'


test_expect_failure \
'git-branch -m u v should fail when the reflog for u is a symlink' \
'git-branch -l u &&
mv .git/logs/refs/heads/u real-u &&
ln -s real-u .git/logs/refs/heads/u &&
git-branch -m u v'

test_done test_done