diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2006-11-29 21:44:56 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-05 23:50:57 -0800 |
| commit | 16c2bfbb449a90db00a46984d7dd7f735caa1d56 (patch) | |
| tree | 6d268e2843256244951d6e07ba7473f3156aa201 | |
| parent | c976d415e5352886f0650f8e2edba81866c38587 (diff) | |
| download | git-16c2bfbb449a90db00a46984d7dd7f735caa1d56.tar.gz git-16c2bfbb449a90db00a46984d7dd7f735caa1d56.tar.xz | |
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>
| -rw-r--r-- | refs.c | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -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); diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index afaa8536a..5782c30b0 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -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 |