Refactor `xgit upload` defaults to preserve history; add `--message`/`--force` controls by Copilot · Pull Request #6 · idea2app/Git-utility

Copilot · 2026-05-10T15:34:56Z

Inspect latest actionable PR comment and current uploadFolder implementation
Re-run baseline validation commands
Reorder upload conditional branches to keep force branch below and minimize diff
Re-run validation after code change
Reply to new review comment with addressing commit hash

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/e468f31c-6ba8-40d4-967a-1683ec2dc3f4

TechQuery · 2026-05-10T22:35:55Z

    targetBranch: string,
-    targetFolder?: string
+    targetFolder?: string,
+    { message = 'upload by Git-utility CLI', force = false } = {}


用普通参数形式

已改为普通参数形式，uploadFolder 现在使用 message、force 常规参数，不再用对象解构。已在提交 dfb9cd4 中处理。CLI 变更无 UI，截图不适用。

TechQuery · 2026-05-10T22:36:24Z

-    if (targetFolder) {
-        const tempFolder = path.join(os.tmpdir(), new URL(GitURL).pathname);
-
-        await fs.remove(tempFolder);
-        await fs.mkdirp(tempFolder);
-        cd(tempFolder);
-
-        await $`git clone -b ${targetBranch} ${GitURL} .`;
-
-        targetFolder = path.join(tempFolder, targetFolder);
-
-        await fs.remove(targetFolder);
-        await fs.mkdirp(targetFolder);
-        await fs.copy(sourceFolder, targetFolder);
-        await fs.remove(path.join(targetFolder, '.git'));
-
-        await $`git add .`;
-        await $`git commit -m "upload by Git-utility CLI"`;
-        await $`git push origin ${targetBranch}`;
-    } else {
+    if (force) {
        cd(sourceFolder);

        await $`git init`;
        await $`git remote add origin ${GitURL}`;
        await $`git checkout -b ${targetBranch}`;
        await $`git add .`;
-        await $`git commit -m "upload by Git-utility CLI"`;
+        await $`git commit -m ${message}`;
        await $`git push --set-upstream origin ${targetBranch} -f`;
        await fs.remove('.git');
+
+        return;
    }
+
+    const tempFolder = path.join(os.tmpdir(), new URL(GitURL).pathname);
+
+    await fs.remove(tempFolder);
+    await fs.mkdirp(tempFolder);
+    cd(tempFolder);
+
+    await $`git clone -b ${targetBranch} ${GitURL} .`;
+
+    const uploadTarget = targetFolder
+        ? path.join(tempFolder, targetFolder)
+        : tempFolder;
+
+    await fs.mkdirp(uploadTarget);
+
+    for (const entry of await fs.readdir(sourceFolder))
+        if (entry !== '.git')
+            await fs.copy(
+                path.join(sourceFolder, entry),
+                path.join(uploadTarget, entry),
+                {
+                    overwrite: true
+                }
+            );
+
+    await $`git add .`;
+    await $`git commit -m ${message}`;
+    await $`git push origin ${targetBranch}`;


保留原有的分支顺序，以便减少 Git 差异。

已按原有顶层分支顺序调整为 if (targetFolder) ... else ...，同时保留默认保留历史的新行为。已在提交 dfb9cd4 中处理。CLI 变更无 UI，截图不适用。

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/a08994ac-56b2-448c-af42-0794e7c08be4

TechQuery · 2026-05-10T23:42:10Z

    } else {
-        cd(sourceFolder);
-
-        await $`git init`;
-        await $`git remote add origin ${GitURL}`;
-        await $`git checkout -b ${targetBranch}`;
-        await $`git add .`;
-        await $`git commit -m "upload by Git-utility CLI"`;
-        await $`git push --set-upstream origin ${targetBranch} -f`;
-        await fs.remove('.git');
+        if (force) {


else 和 if 合并，可以减少一层缩进，才能看得清差异。

已按建议把 else { if (...) ... } 合并为 else if (...)，减少一层缩进，便于看差异。对应提交：b957b11。CLI 逻辑调整无 UI 变更，截图不适用。

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/ac6ceb12-ec23-4821-ad1f-3ce6b3764ae3

TechQuery · 2026-05-11T11:48:29Z

+    } else {
+        const tempFolder = path.join(os.tmpdir(), new URL(GitURL).pathname);
+
+        await fs.remove(tempFolder);
+        await fs.mkdirp(tempFolder);
+        cd(tempFolder);
+
+        await $`git clone -b ${targetBranch} ${GitURL} .`;
+
+        for (const entry of await fs.readdir(sourceFolder))
+            if (entry !== '.git')
+                await fs.copy(
+                    path.join(sourceFolder, entry),
+                    path.join(tempFolder, entry),
+                    {
+                        overwrite: true
+                    }
+                );
+
+        await $`git add .`;
+        await $`git commit -m ${message}`;
+        await $`git push origin ${targetBranch}`;
    }


给 targetFolder = '.' 的默认值，这个分支是不是就和最上面的分支能合并成一种？

已处理，统一了非 force 的上传分支：通过 targetFolder ||= '.' 让根目录上传与目标子目录上传走同一套 clone/overlay/push 逻辑；仅在“未传 targetFolder 且 --force”时走强推分支。对应提交：2a7229b。CLI 逻辑调整无 UI 变更，截图不适用。

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/c5eb54fb-1bd6-4b7b-b957-03c975825502

TechQuery · 2026-05-11T12:49:13Z

+    if (uploadToRoot && force) {
+        cd(sourceFolder);
+
+        await $`git init`;
+        await $`git remote add origin ${GitURL}`;
+        await $`git checkout -b ${targetBranch}`;
+        await $`git add .`;
+        await $`git commit -m ${message}`;
+        await $`git push --set-upstream origin ${targetBranch} -f`;
+        await fs.remove('.git');
+    } else {


把这个分支放到下面，还是那个原则 —— 把 Git 差异降到最低！

已调整为把该分支放到下面：先走通用上传路径，force 特例放到 else，以尽量贴近原始分支顺序并降低差异。对应提交：988c347。CLI 逻辑调整无 UI 变更，截图不适用。

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/e5f024a7-f612-49ba-b026-5817186a4697

Update upload defaults and add message/force options

b5db543

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/e468f31c-6ba8-40d4-967a-1683ec2dc3f4

Copilot AI assigned Copilot and TechQuery May 10, 2026

Copilot created this pull request from a session on behalf of TechQuery May 10, 2026 15:34 View session

TechQuery requested changes May 10, 2026

View reviewed changes

Copilot started work on behalf of TechQuery May 10, 2026 22:36 View session

Copilot AI added 3 commits May 10, 2026 22:37

Address review feedback on upload parameter style and branch order

dfb9cd4

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/a08994ac-56b2-448c-af42-0794e7c08be4

Simplify upload message option forwarding

1361643

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/a08994ac-56b2-448c-af42-0794e7c08be4

Refine upload option parsing without type assertions

1bd2f05

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/a08994ac-56b2-448c-af42-0794e7c08be4

Copilot finished work on behalf of TechQuery May 10, 2026 22:41

Copilot AI requested a review from TechQuery May 10, 2026 22:41

TechQuery requested changes May 10, 2026

View reviewed changes

Copilot started work on behalf of TechQuery May 10, 2026 23:42 View session

Flatten upload force branch to reduce indentation

b957b11

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/ac6ceb12-ec23-4821-ad1f-3ce6b3764ae3

Copilot finished work on behalf of TechQuery May 10, 2026 23:44

Copilot AI requested a review from TechQuery May 10, 2026 23:44

TechQuery requested changes May 11, 2026

View reviewed changes

Copilot started work on behalf of TechQuery May 11, 2026 11:50 View session

Merge non-force upload branches with default target folder

2a7229b

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/c5eb54fb-1bd6-4b7b-b957-03c975825502

Copilot AI requested a review from TechQuery May 11, 2026 11:54

Copilot finished work on behalf of TechQuery May 11, 2026 11:54

TechQuery requested changes May 11, 2026

View reviewed changes

Copilot started work on behalf of TechQuery May 11, 2026 12:50 View session

Move force upload branch below common path

988c347

Agent-Logs-Url: https://github.com/idea2app/Git-utility/sessions/e5f024a7-f612-49ba-b026-5817186a4697

Copilot finished work on behalf of TechQuery May 11, 2026 12:53

Copilot AI requested a review from TechQuery May 11, 2026 12:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Refactor `xgit upload` defaults to preserve history; add `--message`/`--force` controls#6

Refactor `xgit upload` defaults to preserve history; add `--message`/`--force` controls#6
Copilot wants to merge 7 commits into
masterfrom
copilot/override-existing-files-keep-history

Copilot AI commented May 10, 2026 •

edited

Loading

Uh oh!

TechQuery May 10, 2026

Uh oh!

Copilot AI May 10, 2026

Uh oh!

TechQuery May 10, 2026

Uh oh!

Copilot AI May 10, 2026

Uh oh!

TechQuery May 10, 2026

Uh oh!

Copilot AI May 10, 2026

Uh oh!

TechQuery May 11, 2026

Uh oh!

Copilot AI May 11, 2026

Uh oh!

TechQuery May 11, 2026

Uh oh!

Copilot AI May 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

Copilot AI commented May 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

TechQuery May 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 10, 2026

Choose a reason for hiding this comment

Uh oh!

TechQuery May 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 10, 2026

Choose a reason for hiding this comment

Uh oh!

TechQuery May 10, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 10, 2026

Choose a reason for hiding this comment

Uh oh!

TechQuery May 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 11, 2026

Choose a reason for hiding this comment

Uh oh!

TechQuery May 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 11, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Copilot AI commented May 10, 2026 •

edited

Loading