1 files changed, 211 insertions, 0 deletions
diff --git a/test/end-to-end/git-import/tree_structure.sh b/test/end-to-end/git-import/tree_structure.sh
new file mode 100644
index 00000000..078ea0b7
--- /dev/null
+++ b/test/end-to-end/git-import/tree_structure.sh
@@ -0,0 +1,211 @@
+#!/bin/sh
+# Copyright 2025 Huawei Cloud Computing Technology Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+readonly ROOT="${PWD}"
+readonly GIT_IMPORT="${ROOT}/bin/git-import-under-test"
+readonly JUST="${ROOT}/bin/tool-under-test"
+readonly JUST_MR="${ROOT}/bin/mr-tool-under-test"
+
+readonly LBR="${TEST_TMPDIR}/local-build-root"
+readonly OUT="${TEST_TMPDIR}/build-output"
+readonly REPO_DIRS="${TEST_TMPDIR}/repos"
+
+mkdir -p "${OUT}"
+
+COMPAT=""
+if [ "${COMPATIBLE:-}" = "YES" ]; then
+  COMPAT="--compatible"
+fi
+
+# Set up repo foo
+readonly FOO_REPO="${REPO_DIRS}/foo"
+readonly FOO_NESTED_DIR="${FOO_REPO}/src/nested_dir/nested_dir_2"
+mkdir -p "${FOO_NESTED_DIR}"
+echo "content" > "${FOO_NESTED_DIR}/file"
+cd "${FOO_REPO}"
+
+echo
+echo "Creating TARGETS at ${FOO_REPO}:"
+cat > TARGETS << 'EOF'
+{ "": {"type": "export", "target": "test"}
+, "test":
+  { "type": "install"
+  , "deps": [["TREE", null, "src"]]
+  }
+}
+EOF
+cat 
+
+echo
+echo "Creating repos.json at ${FOO_REPO}:"
+cat > repos.json <<'EOF'
+{ "repositories":
+  { "":
+    { "repository":
+      { "type": "file"
+      , "path": "."
+      , "pragma": {"to_git": true}
+      }
+    }
+  }
+}
+EOF
+cat repos.json
+
+echo
+git init
+git checkout --orphan foomaster
+git config user.name 'Nobody'
+git config user.email 'nobody@example.org'
+git add .
+git commit -m 'Add foo' 2>&1
+
+# Set up repo bar
+readonly BAR_REPO="${REPO_DIRS}/bar"
+mkdir -p "${BAR_REPO}"
+cd "${BAR_REPO}"
+
+echo
+echo "Creating repos.template.json at ${BAR_REPO}:"
+cat > repos.template.json << EOF
+{ "repositories":
+  { "":
+    { "repository":
+      { "type": "tree structure"
+      , "repo": "foo"
+      }
+    }
+  }
+}
+EOF
+cat repos.template.json
+
+# Import foo to bar
+"${GIT_IMPORT}" -C repos.template.json --as foo -b foomaster "${REPO_DIRS}/foo" \
+      2>&1 > repos.json
+
+echo repos.json
+cat repos.json
+
+echo
+git init
+git checkout --orphan barmaster
+git config user.name 'Nobody'
+git config user.email 'nobody@example.org'
+git add .
+git commit -m 'Add bar' 2>&1
+
+# Set up main repo
+readonly MAIN_ROOT="${REPO_DIRS}/main"
+mkdir -p "${MAIN_ROOT}"
+cd "${MAIN_ROOT}"
+touch ROOT
+
+echo
+echo "Creating TARGETS at ${MAIN_ROOT}:"
+cat > TARGETS << 'EOF'
+{ "": {"type": "export", "target": "gen"}
+, "gen":
+  { "type": "generic"
+  , "cmds": ["ls -R src > out.txt"]
+  , "outs": ["out.txt"]
+  , "deps": [["TREE", null, "src"]]
+  }
+}
+EOF
+cat TARGETS
+
+echo
+echo "Creating TARGETS.result at ${MAIN_ROOT}:"
+cat > TARGETS.result << 'EOF'
+{ "rename_1": 
+  { "type": "generic"
+  , "cmds": ["mv out.txt foo.txt"]
+  , "outs": ["foo.txt"]
+  , "deps": [["@", "structure_1", "", ""]]
+  }
+, "rename_2": 
+  { "type": "generic"
+  , "cmds": ["mv out.txt bar.txt"]
+  , "outs": ["bar.txt"]
+  , "deps": [["@", "structure_2", "", ""]]
+  }
+, "":
+  { "type": "generic"
+  , "cmds": ["cat foo.txt bar.txt > out.txt"]
+  , "outs": ["out.txt"]
+  , "deps": ["rename_1", "rename_2"]
+  }
+}
+EOF
+cat TARGETS.result
+
+echo
+echo "Creating repos.template.json at ${MAIN_ROOT}:"
+cat > repos.template.json << EOF
+{ "repositories":
+  { "targets":
+    { "repository":
+      { "type": "file"
+      , "path": "."
+      , "pragma": {"to_git": true}
+      }
+    }
+  , "structure":
+    { "repository": "bar"
+    , "target_root": "targets"
+    }
+  , "structure_2":
+    { "repository":
+      { "type": "tree structure"
+      , "repo": "foo"
+      }
+    , "target_root": "targets"
+    }
+  , "result":
+    { "repository":
+      { "type": "file"
+      , "path": "."
+      , "pragma": {"to_git": true}
+      }
+    , "target_root": "targets"
+    , "target_file_name": "TARGETS.result"
+    , "bindings":
+      { "structure_1": "structure"
+      , "structure_2": "structure_2"
+      }
+    }
+  }
+}
+EOF
+cat repos.template.json
+
+"${GIT_IMPORT}" -C repos.template.json --as foo -b foomaster "${REPO_DIRS}/foo" \
+  | "${GIT_IMPORT}" -C - --as bar -b barmaster "${REPO_DIRS}/bar" \
+  2>&1 > repos-full.json
+
+echo repos-full.json
+cat repos-full.json
+
+# Check the result can be built after imports:
+echo
+"${JUST_MR}" -C repos-full.json --norc --just "${JUST}" \
+             --local-build-root "${LBR}" --main "result" \
+             install -L '["env", "PATH='"${PATH}"'"]' \
+             -o "${OUT}/result-full" 2>&1
+
+echo OK