git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] rename_ref: use lstat(2) when testing for symlink
@ 2006-11-29 20:44 Lars Hjemli
  0 siblings, 0 replies; only message in thread
From: Lars Hjemli @ 2006-11-29 20:44 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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>
---

This is on top of my previous [RFC], which is kind of strange, but I hope 
it wasn't dropped on the floor...

 refs.c            |    2 +-
 t/t3200-branch.sh |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/refs.c b/refs.c
index 479f18c..d8c19e6 100644
--- a/refs.c
+++ b/refs.c
@@ -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 afaa853..5782c30 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
-- 
1.4.4.1.gf0df

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2006-11-29 20:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-11-29 20:44 [PATCH] rename_ref: use lstat(2) when testing for symlink Lars Hjemli

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).