safe-push 0.1.1 → 0.2.1

package/dist/index.js

@@ -6859,15 +6859,21 @@ async function getDiffFiles(remote = "origin") {
 `).filter(Boolean);
 }
 async function execPush(args = [], remote = "origin") {
-  const branch = await getCurrentBranch();
-  const isNew = await isNewBranch(remote);
-  const pushArgs = ["push"];
-  if (isNew) {
-    pushArgs.push("-u");
-  }
-  pushArgs.push(remote, branch);
-  if (args.length > 0) {
-    pushArgs.push(...args);
+  let pushArgs;
+  const hasUserRefspec = args.some((arg) => !arg.startsWith("-"));
+  if (hasUserRefspec) {
+    pushArgs = ["push", ...args];
+  } else {
+    const branch = await getCurrentBranch();
+    const isNew = await isNewBranch(remote);
+    pushArgs = ["push"];
+    const hasSetUpstream = args.some((a) => a === "-u" || a === "--set-upstream");
+    if (isNew || hasSetUpstream) {
+      pushArgs.push("-u");
+    }
+    pushArgs.push(remote, branch);
+    const remainingFlags = args.filter((a) => a !== "-u" && a !== "--set-upstream");
+    pushArgs.push(...remainingFlags);
   }
   try {
     const output = await execGit(pushArgs);
@@ -7046,7 +7052,8 @@ function createCheckCommand() {
 
 // src/commands/push.ts
 function createPushCommand() {
-  return new Command("push").description("Check and push if allowed").option("-f, --force", "Bypass safety checks").option("--dry-run", "Show what would be pushed without actually pushing").action(async (options) => {
+  return new Command("push").description("Check and push if allowed").option("-f, --force", "Bypass safety checks").option("--dry-run", "Show what would be pushed without actually pushing").allowUnknownOption().action(async (options, command) => {
+    const gitArgs = command.args;
     try {
       if (!await isGitRepository()) {
         printError("Not a git repository");
@@ -7063,7 +7070,7 @@ function createPushCommand() {
           printSuccess("Dry run: would push (checks bypassed)");
           process.exit(0);
         }
-        const result2 = await execPush();
+        const result2 = await execPush(gitArgs);
         if (result2.success) {
           printSuccess("Push successful");
           process.exit(0);
@@ -7082,7 +7089,7 @@ function createPushCommand() {
               printSuccess("Dry run: would push (user confirmed)");
               process.exit(0);
             }
-            const result2 = await execPush();
+            const result2 = await execPush(gitArgs);
             if (result2.success) {
               printSuccess("Push successful");
               process.exit(0);
@@ -7101,7 +7108,7 @@ function createPushCommand() {
         printSuccess("Dry run: would push");
         process.exit(0);
       }
-      const result = await execPush();
+      const result = await execPush(gitArgs);
       if (result.success) {
         printSuccess("Push successful");
         process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "safe-push",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "description": "Git push safety checker - blocks pushes to forbidden areas",
   "type": "module",
   "bin": {

package/src/commands/push.ts

@@ -18,7 +18,9 @@ export function createPushCommand(): Command {
     .description("Check and push if allowed")
     .option("-f, --force", "Bypass safety checks")
     .option("--dry-run", "Show what would be pushed without actually pushing")
-    .action(async (options: { force?: boolean; dryRun?: boolean }) => {
+    .allowUnknownOption()
+    .action(async (options: { force?: boolean; dryRun?: boolean }, command: Command) => {
+      const gitArgs = command.args;
       try {
         // Gitリポジトリ内か確認
         if (!(await isGitRepository())) {
@@ -43,7 +45,7 @@ export function createPushCommand(): Command {
             process.exit(0);
           }
 
-          const result = await execPush();
+          const result = await execPush(gitArgs);
           if (result.success) {
             printSuccess("Push successful");
             process.exit(0);
@@ -73,7 +75,7 @@ export function createPushCommand(): Command {
                 process.exit(0);
               }
 
-              const result = await execPush();
+              const result = await execPush(gitArgs);
               if (result.success) {
                 printSuccess("Push successful");
                 process.exit(0);
@@ -96,7 +98,7 @@ export function createPushCommand(): Command {
           process.exit(0);
         }
 
-        const result = await execPush();
+        const result = await execPush(gitArgs);
         if (result.success) {
           printSuccess("Push successful");
           process.exit(0);

package/src/git.ts

@@ -106,21 +106,36 @@ export async function execPush(
   args: string[] = [],
   remote = "origin"
 ): Promise<{ success: boolean; output: string }> {
-  const branch = await getCurrentBranch();
-  const isNew = await isNewBranch(remote);
+  let pushArgs: string[];
 
-  const pushArgs = ["push"];
+  // ユーザーがremote/refspecを明示的に指定したか判定
+  const hasUserRefspec = args.some((arg) => !arg.startsWith("-"));
 
-  // 新規ブランチの場合は-uオプションを追加
-  if (isNew) {
-    pushArgs.push("-u");
-  }
+  if (hasUserRefspec) {
+    // ユーザー指定のremote/refspecをそのまま使用
+    pushArgs = ["push", ...args];
+  } else {
+    // 自動でremote/branchを決定
+    const branch = await getCurrentBranch();
+    const isNew = await isNewBranch(remote);
+
+    pushArgs = ["push"];
+
+    // 新規ブランチ、またはユーザーが-uを指定した場合に追加
+    const hasSetUpstream = args.some(
+      (a) => a === "-u" || a === "--set-upstream"
+    );
+    if (isNew || hasSetUpstream) {
+      pushArgs.push("-u");
+    }
 
-  pushArgs.push(remote, branch);
+    pushArgs.push(remote, branch);
 
-  // 追加の引数がある場合
-  if (args.length > 0) {
-    pushArgs.push(...args);
+    // -u/--set-upstream以外のフラグを追加
+    const remainingFlags = args.filter(
+      (a) => a !== "-u" && a !== "--set-upstream"
+    );
+    pushArgs.push(...remainingFlags);
   }
 
   try {