Skip to content

Commit

Permalink
rename_ref: use lstat(2) when testing for symlink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars Hjemli authored and Junio C Hamano committed Dec 6, 2006
1 parent c976d41 commit 16c2bfb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ int rename_ref(const char *oldref, const char *newref)
struct ref_lock *lock;
char msg[PATH_MAX*2 + 100];
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))
return error("reflog for %s is a symlink", oldref);
Expand Down
7 changes: 7 additions & 0 deletions t/t3200-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,11 @@ test_expect_success \
git-branch -m s/s 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

0 comments on commit 16c2bfb

Please sign in to comment.