From: Jonathan Nieder <jrnieder@gmail.com>
To: Sverre Rabbelier <srabbelier@gmail.com>
Cc: David Barr <david.barr@cordelta.com>,
Git Mailing List <git@vger.kernel.org>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Gabriel Filion <lelutin@gmail.com>,
Johannes Sixt <j.sixt@viscovery.net>
Subject: Re: [PATCH 1/2] fast-import: filemodify after M 040000 <tree> "" crashes
Date: Sun, 17 Oct 2010 20:44:04 -0500 [thread overview]
Message-ID: <20101018014404.GD25524@burratino> (raw)
In-Reply-To: <AANLkTik3iSSzKCxi9aeNw+ATPXvTN6yw-=NDGtqCidce@mail.gmail.com>
Sverre Rabbelier wrote:
> On Sun, Oct 17, 2010 at 20:03, Jonathan Nieder <jrnieder@gmail.com> wrote:
>> M 040000 <tree> ""
>> M 100644 :1 "foo"
>>
>> and similar commands (using D, C, or R after resetting the root
>> tree) segfault.
>
> I'm curious, how come this not found earlier? Would seem like a fairly
> regular operation?
Sure, though that isn't what the feature has been used for so far.
Hooray for tests. :)
-- 8< --
Subject: t9300 (fast-import): another test for the "replace root" feature
Another test for the replace root feature. One can imagine an
implementation for which R "some/subdir" "" would free some state
associated to the subdir and leave fast-import confused.
Luckily, git's is not such an implementation.
While at it, change the previous test to use C "some/subdir" ""
instead of R (i.e., test both syntaxes).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
t/t9300-fast-import.sh | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 insertions(+), 1 deletions(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index ce09457..dd90a09 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -990,11 +990,52 @@ test_expect_success \
COMMIT
M 040000 $branch ""
- R "newdir" ""
+ C "newdir" ""
INPUT_END
git fast-import <input &&
git diff --exit-code branch:newdir N9'
+test_expect_success \
+ 'N: modify subtree, extract it, and modify again' \
+ 'echo hello >expect.baz &&
+ echo hello, world >expect.qux &&
+ git fast-import <<-SETUP_END &&
+ commit refs/heads/N10
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ data <<COMMIT
+ hello, tree
+ COMMIT
+
+ deleteall
+ M 644 inline foo/bar/baz
+ data <<EOF
+ hello
+ EOF
+ SETUP_END
+
+ tree=$(git rev-parse --verify N10:) &&
+ git fast-import <<-INPUT_END &&
+ commit refs/heads/N11
+ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+ data <<COMMIT
+ copy to root by id and modify
+ COMMIT
+
+ M 040000 $tree ""
+ M 100644 inline foo/bar/qux
+ data <<EOF
+ hello, world
+ EOF
+ R "foo" ""
+ C "bar/qux" "bar/quux"
+ INPUT_END
+ git show N11:bar/baz >actual.baz &&
+ git show N11:bar/qux >actual.qux &&
+ git show N11:bar/quux >actual.quux &&
+ test_cmp expect.baz actual.baz &&
+ test_cmp expect.qux actual.qux &&
+ test_cmp expect.qux actual.quux'
+
###
### series O
###
--
1.7.2.3
next prev parent reply other threads:[~2010-10-18 1:47 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-07 10:55 [PATCH] fast-import: Allow filemodify to set the root David Barr
2010-10-07 13:58 ` Sverre Rabbelier
2010-10-07 20:28 ` Jonathan Nieder
2010-10-07 20:35 ` Sverre Rabbelier
2010-10-07 23:45 ` David Barr
2010-10-07 23:46 ` David Barr
2010-10-07 23:55 ` Sverre Rabbelier
2010-10-08 6:50 ` Johannes Sixt
2010-10-08 7:05 ` Jonathan Nieder
2010-10-08 7:23 ` Johannes Sixt
2010-10-08 8:00 ` Jonathan Nieder
2010-10-08 8:15 ` Ramkumar Ramachandra
2010-10-08 8:33 ` Gabriel Filion
2010-10-08 8:58 ` David Michael Barr
2010-10-08 16:34 ` Sverre Rabbelier
2010-10-08 17:09 ` Jonathan Nieder
2010-10-09 22:11 ` David Michael Barr
2010-10-09 22:12 ` Sverre Rabbelier
2010-10-10 3:30 ` David Barr
2010-10-11 6:34 ` Jonathan Nieder
2010-10-18 1:00 ` [PATCH 0/2] " Jonathan Nieder
2010-10-18 1:03 ` [PATCH 1/2] fast-import: filemodify after M 040000 <tree> "" crashes Jonathan Nieder
2010-10-18 1:13 ` Sverre Rabbelier
2010-10-18 1:44 ` Jonathan Nieder [this message]
2010-10-20 20:25 ` [PATCH] fast-import: do not clear notes in do_change_note_fanout() Jonathan Nieder
2010-10-18 1:08 ` [PATCH 2/2] fast-import: tighten M 040000 syntax Jonathan Nieder
2011-01-16 2:22 ` [PATCH] Documentation/fast-import: put explanation of M 040000 <dataref> "" in context Jonathan Nieder
2011-01-18 15:04 ` Junio C Hamano
2011-01-18 21:16 ` Jonathan Nieder
2011-01-18 21:43 ` Junio C Hamano
2011-01-18 22:02 ` 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=20101018014404.GD25524@burratino \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=david.barr@cordelta.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=lelutin@gmail.com \
--cc=srabbelier@gmail.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).