From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Petr Baudis <pasky@suse.cz>,
Linus Torvalds <torvalds@linux-foundation.org>,
"Shawn O. Pearce" <spearce@spearce.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 1/2] update-index: refuse to add working tree items beyond symlinks
Date: Mon, 04 Aug 2008 00:51:42 -0700 [thread overview]
Message-ID: <7v7iax43qp.fsf_-_@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vej5543v5.fsf_-_@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Mon, 04 Aug 2008 00:49:02 -0700")
When "sym" is a symbolic link that is inside the working tree, and it
points at a directory "dir" that has "path" in it, "update-index --add
sym/path" used to mistakenly add "sym/path" as if "sym" were a normal
directory.
"git apply", "git diff" and "git merge" have been taught about this issue
some time ago, but "update-index" and "add" have been left ignorant for
too long.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin-update-index.c | 5 ++++-
t/t0055-beyond-symlinks.sh | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+), 1 deletions(-)
create mode 100755 t/t0055-beyond-symlinks.sh
diff --git a/builtin-update-index.c b/builtin-update-index.c
index 38eb53c..434cb8e 100644
--- a/builtin-update-index.c
+++ b/builtin-update-index.c
@@ -194,6 +194,10 @@ static int process_path(const char *path)
int len;
struct stat st;
+ len = strlen(path);
+ if (has_symlink_leading_path(len, path))
+ return error("'%s' is beyond a symbolic link", path);
+
/*
* First things first: get the stat information, to decide
* what to do about the pathname!
@@ -201,7 +205,6 @@ static int process_path(const char *path)
if (lstat(path, &st) < 0)
return process_lstat_error(path, errno);
- len = strlen(path);
if (S_ISDIR(st.st_mode))
return process_directory(path, len, &st);
diff --git a/t/t0055-beyond-symlinks.sh b/t/t0055-beyond-symlinks.sh
new file mode 100755
index 0000000..eb11dd7
--- /dev/null
+++ b/t/t0055-beyond-symlinks.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+test_description='update-index refuses to add beyond symlinks'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ >a &&
+ mkdir b &&
+ ln -s b c &&
+ >c/d &&
+ git update-index --add a b/d
+'
+
+test_expect_success 'update-index --add beyond symlinks' '
+ test_must_fail git update-index --add c/d &&
+ ! ( git ls-files | grep c/d )
+'
+
+test_done
--
1.6.0.rc1.64.g61192
next prev parent reply other threads:[~2008-08-04 7:52 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-16 19:11 [RFC][PATCH 0/7] Submodule support in git mv, git rm Petr Baudis
2008-07-16 19:11 ` [PATCH 1/7] git-mv: Remove dead code branch Petr Baudis
2008-07-16 19:11 ` [PATCH 2/7] t7400: Add short "git submodule add" testsuite Petr Baudis
2008-07-16 19:11 ` [PATCH 3/7] git submodule add: Fix naming clash handling Petr Baudis
2008-07-16 19:11 ` [PATCH 4/7] submodule.*: Introduce simple C interface for submodule lookup by path Petr Baudis
2008-07-16 19:11 ` [PATCH 5/7] git mv: Support moving submodules Petr Baudis
2008-07-17 2:37 ` Junio C Hamano
2008-07-17 13:06 ` Petr Baudis
2008-07-17 22:31 ` [PATCH] git-mv: Keep moved index entries inact Petr Baudis
2008-07-17 22:34 ` [PATCH] git mv: Support moving submodules Petr Baudis
2008-07-19 23:54 ` [PATCH] git-mv: Keep moved index entries inact Junio C Hamano
2008-07-21 0:23 ` Petr Baudis
2008-07-21 0:25 ` [PATCHv2] " Petr Baudis
2008-07-21 4:36 ` Junio C Hamano
2008-07-26 6:46 ` Junio C Hamano
2008-07-27 13:41 ` Petr Baudis
2008-07-27 13:47 ` [PATCH] t/t7001-mv.sh: Propose ability to use git-mv on conflicting entries Petr Baudis
2008-07-28 1:13 ` Junio C Hamano
2008-07-28 1:21 ` Junio C Hamano
2008-07-28 14:20 ` [PATCHv2] git-mv: Keep moved index entries inact SZEDER Gábor
2008-07-28 15:06 ` Johannes Schindelin
2008-07-28 15:14 ` Johannes Schindelin
2008-07-28 18:24 ` Johannes Schindelin
2008-07-28 19:19 ` Junio C Hamano
2008-07-28 23:41 ` Johannes Schindelin
2008-07-28 23:55 ` Johannes Schindelin
2008-07-29 0:17 ` Petr Baudis
2008-07-29 0:46 ` Junio C Hamano
2008-07-29 5:23 ` Junio C Hamano
2008-08-04 7:49 ` Not going beyond symbolic links Junio C Hamano
2008-08-04 7:51 ` Junio C Hamano [this message]
2008-08-04 7:52 ` [PATCH 2/2] add: refuse to add working tree items beyond symlinks Junio C Hamano
2008-08-05 0:21 ` Not going beyond symbolic links Linus Torvalds
2008-08-05 0:54 ` Junio C Hamano
2008-08-05 1:43 ` Linus Torvalds
2008-08-05 1:59 ` Johannes Schindelin
2008-08-05 2:28 ` Linus Torvalds
2008-08-05 6:11 ` Junio C Hamano
2008-08-05 12:54 ` Dmitry Potapov
2008-08-05 23:57 ` Junio C Hamano
2008-08-05 17:15 ` Linus Torvalds
2008-08-05 4:44 ` Junio C Hamano
2008-08-05 11:23 ` Johannes Schindelin
2008-08-05 3:01 ` Junio C Hamano
2008-08-05 3:04 ` david
2008-08-07 6:52 ` Junio C Hamano
2008-08-08 20:55 ` Junio C Hamano
2008-08-08 23:45 ` Linus Torvalds
2008-07-21 1:20 ` [PATCH] git-mv: Keep moved index entries inact Johannes Schindelin
2008-07-21 7:18 ` Petr Baudis
2008-07-21 7:38 ` Junio C Hamano
2008-07-16 19:11 ` [PATCH 6/7] git rm: Support for removing submodules Petr Baudis
2008-07-16 22:41 ` Johannes Schindelin
2008-07-17 12:35 ` Petr Baudis
2008-07-17 12:59 ` Johannes Schindelin
2008-07-16 19:11 ` [PATCH 7/7] t7403: Submodule git mv, git rm testsuite Petr Baudis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v7iax43qp.fsf_-_@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=pasky@suse.cz \
--cc=spearce@spearce.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).