git-stack-cli 1.13.1 → 1.13.2

package/dist/cjs/index.cjs

@@ -29782,7 +29782,13 @@ async function pr_status(branch) {
 }
 async function pr_create(args) {
     const title = safe_quote(args.title);
-    let command = `gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
+    // explicit refs/heads head branch to avoid creation failing
+    //
+    //   ❯ gh pr create --head origin/gs-ED2etrzv2 --base gs-6LAx-On45 --title="2024-01-05 test" --body=""
+    //   pull request create failed: GraphQL: Head sha can't be blank, Base sha can't be blank, No commits between gs-6LAx-On45 and origin/gs-ED2etrzv2, Head ref must be a branch (createPullRequest)
+    //
+    // https://github.com/cli/cli/issues/5465
+    let command = `gh pr create --head refs/heads/${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
     if (args.draft) {
         command += " --draft";
     }
@@ -31782,7 +31788,6 @@ async function run$3(args) {
             before_push_tasks.push(before_push({ group }));
         }
         await Promise.all(before_push_tasks);
-        // git push -f origin HEAD~6:OtVX7Qvrw HEAD~3:E63ytp5dj HEAD~2:gs-NBabNSjXA HEAD~1:gs-UGVJdKNoD HEAD~0:gs-6LAx-On4
         const git_push_command = [`git push -f origin`];
         if (argv.verify === false) {
             git_push_command.push("--no-verify");
@@ -31790,7 +31795,24 @@ async function run$3(args) {
         for (const group of push_group_list) {
             const last_commit = last$1(group.commits);
             invariant(last_commit, "last_commit must exist");
-            const target = `${last_commit.sha}:${group.id}`;
+            // explicit refs/heads head branch to avoid push failing
+            //
+            //   ❯ git push -f origin --no-verify f6e249051b4820a03deb957ddebc19acfd7dfd7c:gs-ED2etrzv2
+            //   error: The destination you provided is not a full refname (i.e.,
+            //   starting with "refs/"). We tried to guess what you meant by:
+            //
+            //   - Looking for a ref that matches 'gs-ED2etrzv2' on the remote side.
+            //   - Checking if the <src> being pushed ('f6e249051b4820a03deb957ddebc19acfd7dfd7c')
+            //     is a ref in "refs/{heads,tags}/". If so we add a corresponding
+            //     refs/{heads,tags}/ prefix on the remote side.
+            //
+            //   Neither worked, so we gave up. You must fully qualify the ref.
+            //   hint: The <src> part of the refspec is a commit object.
+            //   hint: Did you mean to create a new branch by pushing to
+            //   hint: 'f6e249051b4820a03deb957ddebc19acfd7dfd7c:refs/heads/gs-ED2etrzv2'?
+            //   error: failed to push some refs to 'github.com:magus/git-multi-diff-playground.git'
+            //
+            const target = `${last_commit.sha}:refs/heads/${group.id}`;
             git_push_command.push(target);
         }
         await cli(git_push_command);
@@ -37573,7 +37595,7 @@ async function command() {
         .wrap(123)
         // disallow unknown options
         .strict()
-        .version("1.13.1" )
+        .version("1.13.2" )
         .showHidden("show-hidden", "Show hidden options via `git stack help --show-hidden`")
         .help("help", "Show usage via `git stack help`")
         .argv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-stack-cli",
-  "version": "1.13.1",
+  "version": "1.13.2",
   "description": "",
   "author": "magus",
   "license": "MIT",

package/src/app/SyncGithub.tsx

@@ -93,8 +93,6 @@ async function run(args: Args) {
 
     await Promise.all(before_push_tasks);
 
-    // git push -f origin HEAD~6:OtVX7Qvrw HEAD~3:E63ytp5dj HEAD~2:gs-NBabNSjXA HEAD~1:gs-UGVJdKNoD HEAD~0:gs-6LAx-On4
-
     const git_push_command = [`git push -f origin`];
 
     if (argv.verify === false) {
@@ -104,7 +102,25 @@ async function run(args: Args) {
     for (const group of push_group_list) {
       const last_commit = last(group.commits);
       invariant(last_commit, "last_commit must exist");
-      const target = `${last_commit.sha}:${group.id}`;
+
+      // explicit refs/heads head branch to avoid push failing
+      //
+      //   ❯ git push -f origin --no-verify f6e249051b4820a03deb957ddebc19acfd7dfd7c:gs-ED2etrzv2
+      //   error: The destination you provided is not a full refname (i.e.,
+      //   starting with "refs/"). We tried to guess what you meant by:
+      //
+      //   - Looking for a ref that matches 'gs-ED2etrzv2' on the remote side.
+      //   - Checking if the <src> being pushed ('f6e249051b4820a03deb957ddebc19acfd7dfd7c')
+      //     is a ref in "refs/{heads,tags}/". If so we add a corresponding
+      //     refs/{heads,tags}/ prefix on the remote side.
+      //
+      //   Neither worked, so we gave up. You must fully qualify the ref.
+      //   hint: The <src> part of the refspec is a commit object.
+      //   hint: Did you mean to create a new branch by pushing to
+      //   hint: 'f6e249051b4820a03deb957ddebc19acfd7dfd7c:refs/heads/gs-ED2etrzv2'?
+      //   error: failed to push some refs to 'github.com:magus/git-multi-diff-playground.git'
+      //
+      const target = `${last_commit.sha}:refs/heads/${group.id}`;
       git_push_command.push(target);
     }
 

package/src/core/github.tsx

@@ -123,7 +123,14 @@ type CreatePullRequestArgs = {
 
 export async function pr_create(args: CreatePullRequestArgs) {
   const title = safe_quote(args.title);
-  let command = `gh pr create --fill --head ${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
+
+  // explicit refs/heads head branch to avoid creation failing
+  //
+  //   ❯ gh pr create --head origin/gs-ED2etrzv2 --base gs-6LAx-On45 --title="2024-01-05 test" --body=""
+  //   pull request create failed: GraphQL: Head sha can't be blank, Base sha can't be blank, No commits between gs-6LAx-On45 and origin/gs-ED2etrzv2, Head ref must be a branch (createPullRequest)
+  //
+  // https://github.com/cli/cli/issues/5465
+  let command = `gh pr create --head refs/heads/${args.branch} --base ${args.base} --title="${title}" --body="${args.body}"`;
 
   if (args.draft) {
     command += " --draft";