diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-10-17 20:08:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-18 16:42:26 -0700 |
| commit | 3421578393a5983db6fa76a203c9dee95c74801d (patch) | |
| tree | b9382eb0ee4150aeca1a9c7fe5e8f34eb2c6cb5e /t/t9300-fast-import.sh | |
| parent | 5edde510181357b0d0376d5542ddfa51a7e7ba12 (diff) | |
| download | git-3421578393a5983db6fa76a203c9dee95c74801d.tar.gz | |
fast-import: tighten M 040000 syntax
When tree_content_set() is asked to modify the path "foo/bar/",
it first recurses like so:
tree_content_set(root, "foo/bar/", sha1, S_IFDIR) ->
tree_content_set(root:foo, "bar/", ...) ->
tree_content_set(root:foo/bar, "", ...)
And as a side-effect of 2794ad5 (fast-import: Allow filemodify to set
the root, 2010-10-10), this last call is accepted and changes
the tree entry for root:foo/bar to refer to the specified tree.
That seems safe enough but let's reject the new syntax (we never meant
to support it) and make it harder for frontends to introduce pointless
incompatibilities with git fast-import 1.7.3.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 1df11adc90..ce094577e0 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -929,6 +929,20 @@ test_expect_success \ compare_diff_raw expect actual' test_expect_success \ + 'N: reject foo/ syntax' \ + 'subdir=$(git rev-parse refs/heads/branch^0:file2) && + test_must_fail git fast-import <<-INPUT_END + commit refs/heads/N5B + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <<COMMIT + copy with invalid syntax + COMMIT + + from refs/heads/branch^0 + M 040000 $subdir file3/ + INPUT_END' + +test_expect_success \ 'N: copy to root by id and modify' \ 'echo "hello, world" >expect.foo && echo hello >expect.bar && @@ -965,6 +979,22 @@ test_expect_success \ test_cmp expect.foo actual.foo && test_cmp expect.bar actual.bar' +test_expect_success \ + 'N: extract subtree' \ + 'branch=$(git rev-parse --verify refs/heads/branch^{tree}) && + cat >input <<-INPUT_END && + commit refs/heads/N9 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <<COMMIT + extract subtree branch:newdir + COMMIT + + M 040000 $branch "" + R "newdir" "" + INPUT_END + git fast-import <input && + git diff --exit-code branch:newdir N9' + ### ### series O ### |