From: Jonathan Nieder <jrnieder@gmail.com>
To: David Barr <davidbarr@google.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>,
Andrew Sayers <andrew-git@pileofstuff.org>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: Re: [PATCH v3] fast-import: allow 'ls' and filecopy to read the root
Date: Sat, 10 Mar 2012 03:01:33 -0600 [thread overview]
Message-ID: <20120310090132.GF1992@burratino> (raw)
In-Reply-To: <20120310085354.GE1992@burratino>
Jonathan Nieder wrote:
> It has a semantic conflict with the fast-import-ls-fixes series that
> I sent separately
[...]
> I'll send a fixup patch as a reply, for squashing into the merge or
> this patch, whichever is the first commit that contains both topics.
With this tweak, the merge passes the merged set of tests.
diff --git i/fast-import.c c/fast-import.c
index 51cdda29..fe1c8643 100644
--- i/fast-import.c
+++ c/fast-import.c
@@ -1658,8 +1658,6 @@ static int tree_content_get(
n = slash1 - p;
else
n = strlen(p);
- if (!n)
- die("Empty path component found in input");
if (!root->tree)
load_tree(root);
@@ -1669,6 +1667,8 @@ static int tree_content_get(
if (e->name->str_len == n && !strncmp_icase(p, e->name->str_dat, n)) {
if (!slash1)
goto last_component;
+ if (!slash1[1])
+ die("Empty path component found in input");
if (!S_ISDIR(e->versions[1].mode))
return 0;
if (!e->tree)
next prev parent reply other threads:[~2012-03-10 9:01 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 3:13 [BUG] fast-import: ls command on commit root returns missing (was: Bug in svn-fe: copying the root directory acts as if it's an empty directory) David Barr
2012-03-08 5:30 ` [PATCH] fast-import: fix ls command with empty path David Barr
2012-03-08 7:09 ` Jonathan Nieder
2012-03-08 15:29 ` Sverre Rabbelier
2012-03-08 16:39 ` Junio C Hamano
2012-03-08 17:33 ` Dmitry Ivankov
2012-03-08 19:32 ` Jonathan Nieder
2012-03-10 9:48 ` Jonathan Nieder
2012-03-08 18:15 ` Jonathan Nieder
2012-03-10 3:12 ` Jonathan Nieder
2012-03-10 3:20 ` [PATCH maint-1.7.6] fast-import: leakfix for 'ls' of dirty trees Jonathan Nieder
2012-03-10 4:00 ` [PATCH maint-1.7.6] fast-import: don't allow 'ls' of path with empty components Jonathan Nieder
2012-03-10 4:30 ` [PULL maint] two fast-import "ls" fixes Jonathan Nieder
2012-03-10 7:00 ` [NON-PATCH] vcs-svn: avoid 'ls' and filedelete with empty path Jonathan Nieder
2013-06-21 16:33 ` [PATCH] fast-import: fix ls command " Dave Abrahams
2012-03-08 20:27 ` [PATCH v2 0/2] " Jonathan Nieder
2012-03-08 20:31 ` [PATCH 1/2] fast-import: plug leak of dirty trees in 'ls' command Jonathan Nieder
2012-03-08 20:33 ` [PATCH 2/2] fast-import: teach ls command to accept empty path Jonathan Nieder
2012-03-09 4:28 ` David Barr
2012-03-09 9:29 ` Jonathan Nieder
2012-03-10 8:53 ` [PATCH v3] fast-import: allow 'ls' and filecopy to read the root Jonathan Nieder
2012-03-10 9:01 ` Jonathan Nieder [this message]
2012-03-10 9:18 ` [PATCH 2/1] fixup! " Jonathan Nieder
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=20120310090132.GF1992@burratino \
--to=jrnieder@gmail.com \
--cc=andrew-git@pileofstuff.org \
--cc=davidbarr@google.com \
--cc=divanorama@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).