[PATCH] fast-import: fix ls command with empty path
- From
David Barr <davidbarr@google.com>
- Date
- Mar 8, 2012, 05:30 UTC
- Message-ID
- <1331184656-98629-1-git-send-email-davidbarr@google.com>
- In-Reply-To
- <CAFfmPPMxcs0ySgnD7UfUS1yq=qaqfn1qCxdh1HYgFu6WPfpWQg@mail.gmail.com>
There is a pathological Subversion operation that svn-fe handles incorrectly due to an unexpected response from fast-import:
svn cp $SVN_ROOT $SVN_ROOT/subdirectory
When the following command is sent to fast-import:
'ls' SP ':1' SP LF
The expected output is:
'040000' SP 'tree' SP <dataref> HT LF
The actual output is:
'missing' SP LF
This is because tree_content_get() is called but expects a non-empty path. Instead, copy the root entry and force the mode to S_IFDIR.
Reported-by: Andrew Sayers <andrew-git@pileofstuff.org> Signed-off-by: David Barr <davidbarr@google.com> --- fast-import.c | 7 ++++++- t/t9300-fast-import.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/fast-import.c b/fast-import.c index c1486ca..8dbfd4c 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3019,7 +3019,12 @@ static void parse_ls(struct branch *b) die("Garbage after path in: %s", command_buf.buf); p = uq.buf; } - tree_content_get(root, p, &leaf); + if (*p) { + tree_content_get(root, p, &leaf); + } else { + leaf = *root; + leaf.versions[1].mode = S_IFDIR; + } /* * A directory in preparation would have a sha1 of zero * until it is saved. Save, for simplicity. diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 438aaf6..2558a2e 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1400,6 +1400,37 @@ test_expect_success \ test_cmp expect.qux actual.qux && test_cmp expect.qux actual.quux' +test_expect_success PIPE 'N: read and copy root' ' + cat >expect <<-\EOF + :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/file2/newf + :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/file2/oldf + :100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 C100 file4 file3/file4 + :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 C100 newdir/exec.sh file3/newdir/exec.sh + :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/newdir/interesting + EOF + git update-ref -d refs/heads/N12 && + rm -f backflow && + mkfifo backflow && + ( + exec <backflow && + cat <<-EOF && + commit refs/heads/N12 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <<COMMIT + copy root directory by tree hash read via ls + COMMIT + + from refs/heads/branch^0 + ls "" + EOF + read mode type tree filename && + echo "M 040000 $tree file3" + ) | + git fast-import --cat-blob-fd=3 3>backflow && + git diff-tree -C --find-copies-harder -r N12^ N12 >actual && + compare_diff_raw expect actual +' + ### ### series O ###
-- 1.7.9.3