From 9da6d970d68a533ef1e73b0f446eb2cf9e7c43ce Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 01:19:23 +0000
Subject: [PATCH 1/7] feat: add commit-graph command and register in git shim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement `git commit-graph write/verify` command handler:
- write: supports --reachable, --stdin-packs, --stdin-commits,
  --object-dir, --append, --changed-paths (accepted/ignored)
- verify: validates signature, hash-version, checksum trailer
- Register "commit-graph" in main.mbt dispatch

Add commit-graph and multi-pack-index to git shim command lists
(GIT_SHIM_STRICT_CMDS_ALL, GIT_SHIM_RANDOM_CMDS, GIT_SHIM_FULL_CMDS)
so t5318/t5319/t6500 tests exercise the bit implementation rather
than falling through to real git.

Closes #85 (partial — t5318, t5319, t6500 coverage)
---
 modules/bit/src/cmd/bit/commit_graph.mbt      | 143 ++++++++++++++++++
 .../src/cmd/bit/commit_graph_write_wbtest.mbt |  28 ++++
 modules/bit/src/cmd/bit/main.mbt              |   4 +
 tools/lib-git-shim.sh                         |   6 +-
 4 files changed, 178 insertions(+), 3 deletions(-)

diff --git a/modules/bit/src/cmd/bit/commit_graph.mbt b/modules/bit/src/cmd/bit/commit_graph.mbt
index 3bf1b135..e13203f8 100644
--- a/modules/bit/src/cmd/bit/commit_graph.mbt
+++ b/modules/bit/src/cmd/bit/commit_graph.mbt
@@ -1,3 +1,146 @@
+///| Commit-graph command handler and utilities
+
+///|
+async fn handle_commit_graph(args : Array[String]) -> Unit raise Error {
+  let fs = OsFs::new()
+  let git_dir = find_git_dir(fs)
+  let mut subcommand : String? = None
+  let mut object_dir : String? = None
+  let mut reachable = false
+  let mut stdin_packs = false
+  let mut stdin_commits = false
+  let mut append = false
+  let mut verify_shallow = false
+  let mut progress = false
+  let mut i = 0
+  while i < args.length() {
+    let arg = args[i]
+    match arg {
+      "write" | "verify" => subcommand = Some(arg)
+      "--reachable" => reachable = true
+      "--stdin-packs" => stdin_packs = true
+      "--stdin-commits" => stdin_commits = true
+      "--append" => append = true
+      "--shallow" => verify_shallow = true
+      "--progress" => progress = true
+      "--no-progress" => progress = false
+      "--object-dir" if i + 1 < args.length() => {
+        object_dir = Some(args[i + 1])
+        i += 2
+        continue
+      }
+      _ if arg.has_prefix("--object-dir=") =>
+        object_dir = Some(arg[13:].to_owned())
+      // Accepted but ignored options
+      "--changed-paths" | "--no-changed-paths" => ()
+      _ if arg.has_prefix("--max-new-filters") => ()
+      _ if arg.has_prefix("--split") => ()
+      _ if arg.has_prefix("--expire-time") => ()
+      _ if arg.has_prefix("--no-expire-time") => ()
+      _ if arg.has_prefix("-") => warn_unimplemented_arg("commit-graph", arg)
+      _ => ()
+    }
+    i += 1
+  }
+  ignore(append)
+  ignore(progress)
+  ignore(verify_shallow)
+  // --object-dir points to the objects directory; git_dir is one level up.
+  // If not specified, use the detected git_dir.
+  let effective_git_dir = match object_dir {
+    Some(d) => {
+      let resolved = resolve_in_cwd(d)
+      // Strip trailing "/objects" suffix if present to get git_dir
+      if resolved.has_suffix("/objects") {
+        String::unsafe_substring(
+          resolved,
+          start=0,
+          end=resolved.length() - 8,
+        )
+      } else {
+        // Assume it IS the git_dir (e.g. bare repo)
+        resolved
+      }
+    }
+    None => git_dir
+  }
+  match subcommand {
+    None | Some("write") => {
+      if stdin_commits {
+        write_commit_graph_from_stdin_commits(fs, effective_git_dir)
+      } else if stdin_packs {
+        write_commit_graph(fs, effective_git_dir, false)
+      } else if reachable {
+        write_commit_graph(fs, effective_git_dir, true)
+      } else {
+        write_commit_graph(fs, effective_git_dir, false)
+      }
+    }
+    Some("verify") => cgraph_verify(fs, effective_git_dir)
+    Some(other) => {
+      eprint_line("error: unknown subcommand: " + other)
+      @sys.exit(1)
+    }
+  }
+}
+
+///|
+async fn write_commit_graph_from_stdin_commits(
+  fs : OsFs,
+  git_dir : String,
+) -> Unit raise Error {
+  // --stdin-commits: fall back to full reachable walk (stdin parsing not yet implemented)
+  write_commit_graph(fs, git_dir, true)
+}
+
+///|
+async fn cgraph_verify(fs : OsFs, git_dir : String) -> Unit raise Error {
+  let rfs : &@bitcore.RepoFileSystem = fs
+  let graph_path = git_dir + "/objects/info/commit-graph"
+  if !rfs.is_file(graph_path) {
+    eprint_line("error: commit-graph file not found")
+    @sys.exit(1)
+  }
+  let data = rfs.read_file(graph_path)
+  if data.length() < 8 {
+    eprint_line("error: commit-graph file too small")
+    @sys.exit(1)
+  }
+  let sig = (data[0].to_int() << 24) |
+    (data[1].to_int() << 16) |
+    (data[2].to_int() << 8) |
+    data[3].to_int()
+  if sig != 0x43475048 {
+    eprint_line("error: commit-graph signature mismatch")
+    @sys.exit(1)
+  }
+  let hash_version = data[5].to_int()
+  let hash_size = if hash_version == 2 { 32 } else { 20 }
+  let expected_hash_version = commit_graph_repo_hash_version(rfs, git_dir)
+  if hash_version != expected_hash_version {
+    eprint_line(
+      "error: commit-graph hash version \{hash_version} does not match repository hash version \{expected_hash_version}",
+    )
+    @sys.exit(1)
+  }
+  // Verify checksum trailer
+  if data.length() < hash_size {
+    eprint_line("error: commit-graph file too small for checksum")
+    @sys.exit(1)
+  }
+  let body_len = data.length() - hash_size
+  let stored_trailer = @bitcore.ObjectId::from_bytes_at(
+    data, body_len, hash_size~,
+  )
+  let expected_trailer = @bitcore.hash_prefix(data, body_len, hash_size~)
+  if stored_trailer != expected_trailer {
+    eprint_line("error: commit-graph checksum mismatch")
+    @sys.exit(1)
+  }
+  // Verify all commits exist
+  check_commit_graph_paranoia(fs, git_dir)
+}
+
 ///| Commit-graph file reader (minimal: header validation + hash version check)
 
 ///|
diff --git a/modules/bit/src/cmd/bit/commit_graph_write_wbtest.mbt b/modules/bit/src/cmd/bit/commit_graph_write_wbtest.mbt
index f9e4d11e..7212153f 100644
--- a/modules/bit/src/cmd/bit/commit_graph_write_wbtest.mbt
+++ b/modules/bit/src/cmd/bit/commit_graph_write_wbtest.mbt
@@ -119,3 +119,31 @@ async test "cgraph: write_commit_graph uses sha256 trailer in sha256 repo" {
   assert_true(graph_file.find_commit(commit_id) >= 0)
   cleanup_tree(fs, root)
 }
+
+///|
+async test "cgraph: verify passes for valid commit-graph" {
+  @bitnative.init_native_io()
+  let fs = OsFs::new()
+  let root = "/tmp/bit-test-cgraph-verify-" + get_current_timestamp().to_string()
+  cleanup_tree(fs, root)
+  let (git_dir, _commit_id) = cgraph_setup_sha256_repo(fs, root)
+  write_commit_graph(fs, git_dir, true)
+  // verify should not exit(1)
+  cgraph_verify(fs, git_dir)
+  cleanup_tree(fs, root)
+}
+
+///|
+async test "cgraph: handle_commit_graph write --reachable" {
+  @bitnative.init_native_io()
+  let fs = OsFs::new()
+  let root = "/tmp/bit-test-cgraph-cmd-" + get_current_timestamp().to_string()
+  cleanup_tree(fs, root)
+  let (git_dir, _) = cgraph_setup_sha256_repo(fs, root)
+  let graph_path = git_dir + "/objects/info/commit-graph"
+  assert_false(fs.is_file(graph_path))
+  // simulate: git commit-graph write --reachable --object-dir <git_dir>/objects
+  handle_commit_graph(["write", "--reachable", "--object-dir", git_dir + "/objects"])
+  assert_true(fs.is_file(graph_path))
+  cleanup_tree(fs, root)
+}
diff --git a/modules/bit/src/cmd/bit/main.mbt b/modules/bit/src/cmd/bit/main.mbt
index 79370ec3..32a17593 100644
--- a/modules/bit/src/cmd/bit/main.mbt
+++ b/modules/bit/src/cmd/bit/main.mbt
@@ -384,6 +384,9 @@ fn show_command_help_specs() -> Array[(String, String, String)] {
     (
       "multi-pack-index", "git multi-pack-index [<options>] <subcommand>", "Write and verify multi-pack-indexes.",
     ),
+    (
+      "commit-graph", "git commit-graph [write | verify] [<options>]", "Write and verify Git commit-graph files.",
+    ),
     (
       "cherry", "git cherry [<options>] <upstream> [<head>]", "Find commits yet to be applied to upstream.",
     ),
@@ -1349,6 +1352,7 @@ async fn dispatch_known_command(
     "send-pack" => handle_send_pack(rest)
     "range-diff" => handle_range_diff(rest)
     "multi-pack-index" => handle_multi_pack_index(rest)
+    "commit-graph" => handle_commit_graph(rest)
     "cherry" => handle_cherry(rest)
     "completion" => handle_completion(rest)
     "x/hooks" => handle_x_hooks(rest)
diff --git a/tools/lib-git-shim.sh b/tools/lib-git-shim.sh
index 309be9f4..540527d0 100755
--- a/tools/lib-git-shim.sh
+++ b/tools/lib-git-shim.sh
@@ -45,11 +45,11 @@ git_shim_allowlist_tests() {
 }
 
 # Default shim command lists (used by multiple wrappers).
-GIT_SHIM_STRICT_CMDS_ALL="init add diff diff-files diff-index ls-files tag branch checkout switch commit log show reflog reset update-ref update-index status merge rebase clone push fetch pull mv notes stash rm submodule worktree config show-ref for-each-ref rev-parse symbolic-ref cherry-pick remote cat-file hash-object ls-tree write-tree commit-tree receive-pack upload-pack pack-objects index-pack format-patch describe gc clean sparse-checkout restore blame grep shell"
+GIT_SHIM_STRICT_CMDS_ALL="init add diff diff-files diff-index ls-files tag branch checkout switch commit log show reflog reset update-ref update-index status merge rebase clone push fetch pull mv notes stash rm submodule worktree config show-ref for-each-ref rev-parse symbolic-ref cherry-pick remote cat-file hash-object ls-tree write-tree commit-tree receive-pack upload-pack pack-objects index-pack format-patch describe gc clean sparse-checkout restore blame grep commit-graph multi-pack-index shell"
 
-GIT_SHIM_RANDOM_CMDS="init status add commit log show branch checkout switch reset rebase stash cherry-pick diff diff-files diff-index merge tag rm mv config sparse-checkout restore rev-parse cat-file ls-files hash-object ls-tree write-tree show-ref update-ref symbolic-ref reflog worktree gc clean grep submodule revert notes bisect describe blame format-patch shortlog remote clone fetch pull push receive-pack upload-pack pack-objects index-pack shell"
+GIT_SHIM_RANDOM_CMDS="init status add commit log show branch checkout switch reset rebase stash cherry-pick diff diff-files diff-index merge tag rm mv config sparse-checkout restore rev-parse cat-file ls-files hash-object ls-tree write-tree show-ref update-ref symbolic-ref reflog worktree gc clean grep submodule revert notes bisect describe blame format-patch shortlog remote clone fetch pull push receive-pack upload-pack pack-objects index-pack commit-graph multi-pack-index shell"
 
-GIT_SHIM_FULL_CMDS="init status add commit log show branch checkout switch reset rebase stash cherry-pick diff diff-files diff-index merge tag rm mv config sparse-checkout restore rev-parse cat-file ls-files hash-object ls-tree write-tree show-ref update-ref update-index symbolic-ref reflog worktree gc clean grep submodule revert notes bisect describe blame format-patch shortlog remote clone fetch pull push receive-pack upload-pack pack-objects index-pack shell"
+GIT_SHIM_FULL_CMDS="init status add commit log show branch checkout switch reset rebase stash cherry-pick diff diff-files diff-index merge tag rm mv config sparse-checkout restore rev-parse cat-file ls-files hash-object ls-tree write-tree show-ref update-ref update-index symbolic-ref reflog worktree gc clean grep submodule revert notes bisect describe blame format-patch shortlog remote clone fetch pull push receive-pack upload-pack pack-objects index-pack commit-graph multi-pack-index shell"
 
 GIT_SHIM_ONE_CMDS="init receive-pack upload-pack pack-objects index-pack shell"
 GIT_SHIM_ONE_REMOTE_CMDS="init receive-pack upload-pack pack-objects index-pack remote shell"

From 3ddb0cef2454ba43a8597f387af086abdd287d7f Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 04:47:10 +0000
Subject: [PATCH 2/7] for-each-ref: fix %(version:refname), %(v:refname), and
 trailers boolean options

- Add version/v atoms to is_known_atom and format evaluator
- Fix trailers option validation to accept valueonly=true/false,
  unfold=true/false, only=... with = suffix
- Fix trailers evaluation to properly parse boolean =true/false/yes/no

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 modules/bit/src/cmd/bit/for_each_ref.mbt | 39 ++++++++++++++++++------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/modules/bit/src/cmd/bit/for_each_ref.mbt b/modules/bit/src/cmd/bit/for_each_ref.mbt
index 04f312e3..c239c878 100644
--- a/modules/bit/src/cmd/bit/for_each_ref.mbt
+++ b/modules/bit/src/cmd/bit/for_each_ref.mbt
@@ -875,8 +875,19 @@ async fn for_each_ref_validate_atom(atom : String) -> Unit {
         opt == "only=true" ||
         opt == "only=no" ||
         opt == "only=false" ||
+        opt.has_prefix("only=") ||
         opt == "unfold" ||
+        opt == "unfold=yes" ||
+        opt == "unfold=true" ||
+        opt == "unfold=no" ||
+        opt == "unfold=false" ||
+        opt.has_prefix("unfold=") ||
         opt == "valueonly" ||
+        opt == "valueonly=yes" ||
+        opt == "valueonly=true" ||
+        opt == "valueonly=no" ||
+        opt == "valueonly=false" ||
+        opt.has_prefix("valueonly=") ||
         opt.has_prefix("key=") ||
         opt.has_prefix("separator=") ||
         opt.has_prefix("key_value_separator=") {
@@ -1155,6 +1166,8 @@ fn for_each_ref_is_known_atom(atom : String) -> Bool {
     | "is-base"
     | "ahead-behind"
     | "worktreepath"
+    | "version"
+    | "v"
     | "*objectname"
     | "*objecttype"
     | "*objectsize"
@@ -2371,6 +2384,8 @@ async fn for_each_ref_atom(
   match atom {
     "refname" | "refname:" => refname
     "refname:short" => for_each_ref_short_refname(fs, git_dir, refname)
+    // %(version:refname) and %(v:refname) are sort-only aliases; output the refname as-is
+    "version:refname" | "v:refname" => refname
     _ if atom.has_prefix("refname:lstrip=") || atom.has_prefix("refname:strip=") => {
       let eq_pos = atom.find("=").unwrap()
       let n_str = String::unsafe_substring(
@@ -4374,16 +4389,22 @@ async fn for_each_ref_format_trailers_atom(
     let mut remaining = options_str
     while remaining.length() > 0 {
       let (opt, rest) = for_each_ref_split_trailer_opt(remaining)
-      if opt == "only" || opt == "only=yes" || opt == "only=true" {
-        only = true
-        only_set = true
-      } else if opt == "only=no" || opt == "only=false" {
-        only = false
+      if opt == "only" ||
+        opt == "only=yes" ||
+        opt == "only=true" ||
+        opt.has_prefix("only=") {
+        only = opt != "only=no" && opt != "only=false"
         only_set = true
-      } else if opt == "unfold" {
-        unfold = true
-      } else if opt == "valueonly" {
-        valueonly = true
+      } else if opt == "unfold" ||
+        opt == "unfold=yes" ||
+        opt == "unfold=true" ||
+        opt.has_prefix("unfold=") {
+        unfold = opt != "unfold=no" && opt != "unfold=false"
+      } else if opt == "valueonly" ||
+        opt == "valueonly=yes" ||
+        opt == "valueonly=true" ||
+        opt.has_prefix("valueonly=") {
+        valueonly = opt != "valueonly=no" && opt != "valueonly=false"
       } else if opt.has_prefix("key=") {
         let key_val = String::unsafe_substring(opt, start=4, end=opt.length())
         // Strip trailing colon if present

From 15cd13976722afe323aa2442223074026d550474 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 05:39:44 +0000
Subject: [PATCH 3/7] for-each-ref: fix nested %(align) in suppressed
 if-branches and error messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- %(align:N) inside a suppressed %(if)%(then) branch no longer emits
  spurious padding; align_stack push is guarded by output-active check
  so scope_stack still tracks the %(end) correctly
- Fix error messages to drop double-% escaping (%%(if) → %(if), etc.)
- Change "unknown field name 'X'" → "unknown field name: X" to match git
- Change "%(end) without corresponding %(if)/%(align)" → "without
  corresponding atom" to match git
- Add validation for atoms that do not take arguments: objecttype,
  deltabase
- Add argument validation for objectsize, upstream, push, symref

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 modules/bit/src/cmd/bit/for_each_ref.mbt | 82 ++++++++++++++++++++----
 1 file changed, 70 insertions(+), 12 deletions(-)

diff --git a/modules/bit/src/cmd/bit/for_each_ref.mbt b/modules/bit/src/cmd/bit/for_each_ref.mbt
index c239c878..ef9efefb 100644
--- a/modules/bit/src/cmd/bit/for_each_ref.mbt
+++ b/modules/bit/src/cmd/bit/for_each_ref.mbt
@@ -745,11 +745,11 @@ async fn for_each_ref_validate_if_then_else(format : String) -> Unit {
     } else if atom == "then" {
       if stack.length() == 0 || stack[stack.length() - 1] != "if" {
         if stack.length() > 0 && stack[stack.length() - 1] == "if-then" {
-          eprint_line("fatal: format: %%(then) atom used more than once")
+          eprint_line("fatal: format: %(then) atom used more than once")
         } else if stack.length() > 0 && stack[stack.length() - 1] == "if-else" {
-          eprint_line("fatal: format: %%(then) atom used after %%(else)")
+          eprint_line("fatal: format: %(then) atom used after %(else)")
         } else {
-          eprint_line("fatal: format: %%(then) atom used without a %%(if) atom")
+          eprint_line("fatal: format: %(then) atom used without a %(if) atom")
         }
         @sys.exit(1)
       }
@@ -757,9 +757,9 @@ async fn for_each_ref_validate_if_then_else(format : String) -> Unit {
     } else if atom == "else" {
       if stack.length() == 0 || stack[stack.length() - 1] != "if-then" {
         if stack.length() > 0 && stack[stack.length() - 1] == "if-else" {
-          eprint_line("fatal: format: %%(else) atom used more than once")
+          eprint_line("fatal: format: %(else) atom used more than once")
         } else {
-          eprint_line("fatal: format: %%(else) atom used without a %%(if) atom")
+          eprint_line("fatal: format: %(else) atom used without a %(if) atom")
         }
         @sys.exit(1)
       }
@@ -767,14 +767,14 @@ async fn for_each_ref_validate_if_then_else(format : String) -> Unit {
     } else if atom == "end" {
       if stack.length() == 0 {
         eprint_line(
-          "fatal: format: %%(end) atom used without corresponding %%(if)/%(align) atom",
+          "fatal: format: %(end) atom used without corresponding atom",
         )
         @sys.exit(1)
       }
       let top = stack[stack.length() - 1]
       if top == "if" {
         // %(if) without %(then) before %(end)
-        eprint_line("fatal: format: %%(if) atom used without a %%(then) atom")
+        eprint_line("fatal: format: %(if) atom used without a %(then) atom")
         @sys.exit(1)
       }
       ignore(stack.pop())
@@ -783,13 +783,13 @@ async fn for_each_ref_validate_if_then_else(format : String) -> Unit {
   if stack.length() > 0 {
     let top = stack[stack.length() - 1]
     if top == "if" {
-      eprint_line("fatal: format: %%(if) atom used without a %%(then) atom")
+      eprint_line("fatal: format: %(if) atom used without a %(then) atom")
     } else if top == "if-then" || top == "if-else" {
       eprint_line(
-        "fatal: format: expected %%(end) atom after %%(then) or %%(else)",
+        "fatal: format: expected %(end) atom after %(then) or %(else)",
       )
     } else {
-      eprint_line("fatal: format: expected %%(end) atom")
+      eprint_line("fatal: format: expected %(end) atom")
     }
     @sys.exit(1)
   }
@@ -973,6 +973,58 @@ async fn for_each_ref_validate_atom(atom : String) -> Unit {
     eprint_line("fatal: %(HEAD) does not take arguments")
     @sys.exit(1)
   }
+  // Validate atoms that do not take arguments
+  if atom.has_prefix("objecttype:") {
+    eprint_line("fatal: %(objecttype) does not take arguments")
+    @sys.exit(1)
+  }
+  if atom.has_prefix("deltabase:") {
+    eprint_line("fatal: %(deltabase) does not take arguments")
+    @sys.exit(1)
+  }
+  // Validate objectsize arguments
+  if atom.has_prefix("objectsize:") {
+    let arg = String::unsafe_substring(atom, start=11, end=atom.length())
+    if arg != "disk" {
+      eprint_line("fatal: unrecognized %(objectsize) argument: " + arg)
+      @sys.exit(1)
+    }
+  }
+  // Validate upstream/push arguments
+  if atom.has_prefix("upstream:") {
+    let arg = String::unsafe_substring(atom, start=9, end=atom.length())
+    match arg {
+      "short" | "track" | "trackshort" | "remotename" | "remoteref" => ()
+      _ => {
+        eprint_line("fatal: unrecognized %(upstream) argument: " + arg)
+        @sys.exit(1)
+      }
+    }
+  }
+  if atom.has_prefix("push:") {
+    let arg = String::unsafe_substring(atom, start=5, end=atom.length())
+    match arg {
+      "short" | "track" | "trackshort" | "remotename" | "remoteref" => ()
+      _ => {
+        eprint_line("fatal: unrecognized %(push) argument: " + arg)
+        @sys.exit(1)
+      }
+    }
+  }
+  // Validate symref arguments
+  if atom.has_prefix("symref:") {
+    let arg = String::unsafe_substring(atom, start=7, end=atom.length())
+    match arg {
+      "short" => ()
+      _ if arg.has_prefix("lstrip=") ||
+        arg.has_prefix("strip=") ||
+        arg.has_prefix("rstrip=") => ()
+      _ => {
+        eprint_line("fatal: unrecognized %(symref) argument: " + arg)
+        @sys.exit(1)
+      }
+    }
+  }
   // Validate subject
   if atom.has_prefix("subject:") && atom != "subject:sanitize" {
     let arg = String::unsafe_substring(atom, start=8, end=atom.length())
@@ -1075,7 +1127,7 @@ async fn for_each_ref_validate_atom(atom : String) -> Unit {
   }
   // Validate unknown atom names (must be last check)
   if !for_each_ref_is_known_atom(atom) {
-    eprint_line("fatal: unknown field name '" + atom + "'")
+    eprint_line("fatal: unknown field name: " + atom)
     @sys.exit(1)
   }
 }
@@ -1977,7 +2029,13 @@ async fn for_each_ref_format(
             end=atom.length(),
           )
           let parsed = for_each_ref_parse_align_args(align_args)
-          align_stack.push((out.length(), parsed.0, parsed.1))
+          // Only record position in output buffer if we're actually outputting.
+          // In a suppressed if-branch we still push "align" to scope_stack so
+          // the matching %(end) is consumed correctly, but we must not push to
+          // align_stack or the %(end) handler will emit spurious padding.
+          if for_each_ref_if_output_active(if_state, if_result, if_depth) {
+            align_stack.push((out.length(), parsed.0, parsed.1))
+          }
           scope_stack.push("align")
           i = end_pos + 1
           continue

From e3625923d4a1cc218aa7dbfd944a4a0a571636cd Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 05:45:09 +0000
Subject: [PATCH 4/7] for-each-ref: support %NN two-digit hex escapes (e.g. %09
 for tab)

Replace ad-hoc %0a/%0d/%00 special cases with a general %NN two-digit
hex escape handler. This matches git's behaviour where %09 emits a tab,
%0a a newline, %1b an escape, etc. The %xNN form (already supported) is
kept alongside; git itself does not recognise %xNN but it is harmless.

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 modules/bit/src/cmd/bit/for_each_ref.mbt | 49 ++++++++----------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/modules/bit/src/cmd/bit/for_each_ref.mbt b/modules/bit/src/cmd/bit/for_each_ref.mbt
index ef9efefb..69a16725 100644
--- a/modules/bit/src/cmd/bit/for_each_ref.mbt
+++ b/modules/bit/src/cmd/bit/for_each_ref.mbt
@@ -2283,41 +2283,11 @@ async fn for_each_ref_format(
         i += 1
       }
     } else if chars[i] == '%' &&
-      i + 1 < len &&
-      chars[i + 1] == '0' &&
-      i + 2 < len {
-      // %0a = newline, %00 = NUL, etc. (hex escape)
-      let hex_ch = chars[i + 2]
-      let val = match hex_ch {
-        'a' | 'A' => Some('\n')
-        'd' | 'D' => Some('\r')
-        '0' => {
-          let nul : Char = Int::unsafe_to_char(0)
-          Some(nul)
-        }
-        _ => None
-      }
-      match val {
-        Some(c) => {
-          if for_each_ref_if_output_active(if_state, if_result, if_depth) {
-            byte_buf_push_char(out, c)
-          }
-          i += 3
-        }
-        None => {
-          if for_each_ref_if_output_active(if_state, if_result, if_depth) {
-            byte_buf_push_char(out, chars[i])
-          }
-          i += 1
-        }
-      }
-    } else if chars[i] == '%' &&
-      i + 1 < len &&
-      chars[i + 1] == 'x' &&
-      i + 3 < len {
-      // %xNN hex escape
+      i + 2 < len &&
+      (chars[i + 1] == 'x' || chars[i + 1] == 'X') {
+      // %xNN / %XNN hex escape (e.g. %x09 = tab)
       let hi = for_each_ref_hex_digit(chars[i + 2])
-      let lo = for_each_ref_hex_digit(chars[i + 3])
+      let lo = if i + 3 < len { for_each_ref_hex_digit(chars[i + 3]) } else { -1 }
       if hi >= 0 && lo >= 0 {
         if for_each_ref_if_output_active(if_state, if_result, if_depth) {
           out.push(((hi * 16 + lo) & 0xFF).to_byte())
@@ -2329,6 +2299,17 @@ async fn for_each_ref_format(
         }
         i += 1
       }
+    } else if chars[i] == '%' &&
+      i + 2 < len &&
+      for_each_ref_hex_digit(chars[i + 1]) >= 0 &&
+      for_each_ref_hex_digit(chars[i + 2]) >= 0 {
+      // %NN two-digit hex escape (e.g. %09 = tab, %0a = newline)
+      let hi = for_each_ref_hex_digit(chars[i + 1])
+      let lo = for_each_ref_hex_digit(chars[i + 2])
+      if for_each_ref_if_output_active(if_state, if_result, if_depth) {
+        out.push(((hi * 16 + lo) & 0xFF).to_byte())
+      }
+      i += 3
     } else if chars[i] == '%' && i + 1 < len && chars[i + 1] == '%' {
       if for_each_ref_if_output_active(if_state, if_result, if_depth) {
         out.push(b'%')

From 2fe002d1ff193e6a781b54122663fc32c02ef185 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 06:09:02 +0000
Subject: [PATCH 5/7] feat: add bit issue dep add/remove/list + rebase
 REBASE_HEAD and --preserve-merges
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## bit issue dep (issue #31)

Add dependency tracking to bit issue:
- `bit issue dep add <id> <blocked-by-id>` — mark one issue as blocked by another
- `bit issue dep remove <id> <blocked-by-id>` — remove the dependency
- `bit issue dep list <id>` — show blocked-by and blocking relationships

Implementation:
- Add `blocked_by` and `blocking` fields to Issue and WorkItem structs
- Serialize as `blocked-by <id>` / `blocking <id>` lines in the work-item format
- Hub::add_dep / Hub::remove_dep maintain bidirectional consistency
- Both legacy Issue and WorkItem serialization/deserialization updated

## rebase fixes (issue #88)

- Write REBASE_HEAD to .git/ when a conflict occurs (used by hooks/tools)
- Remove REBASE_HEAD when rebase state is cleared (--continue/--abort/--skip)
- Accept --preserve-merges as alias for --rebase-merges (deprecated but used
  in some scripts)

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 modules/bit/src/cmd/bit/hub_issue.mbt |  83 +++++++++++++++++++++
 modules/bit/src/cmd/bit/rebase.mbt    |   4 +-
 modules/bit_lib/src/rebase.mbt        |   9 +++
 modules/bitx_hub/src/format.mbt       |  32 +++++++++
 modules/bitx_hub/src/issue.mbt        | 100 ++++++++++++++++++++++++++
 modules/bitx_hub/src/types.mbt        |  36 ++++++++++
 6 files changed, 262 insertions(+), 2 deletions(-)

diff --git a/modules/bit/src/cmd/bit/hub_issue.mbt b/modules/bit/src/cmd/bit/hub_issue.mbt
index 75a8f19f..0f5e93ee 100644
--- a/modules/bit/src/cmd/bit/hub_issue.mbt
+++ b/modules/bit/src/cmd/bit/hub_issue.mbt
@@ -26,6 +26,9 @@ fn print_hub_issue_usage() -> Unit {
   )
   println("  comment list <issue-id>")
   println("  link <issue-id> <pr-id>")
+  println("  dep add <issue-id> <blocked-by-id>    (add blocked-by dependency)")
+  println("  dep remove <issue-id> <blocked-by-id> (remove dependency)")
+  println("  dep list <issue-id>                   (list dependencies)")
   println("  claim <issue-id> [--remote <url>] [--auth-token <token>]")
   println("  unclaim <issue-id> [--remote <url>] [--auth-token <token>]")
   println(
@@ -78,6 +81,7 @@ async fn handle_hub_issue(args : Array[String]) -> Unit raise Error {
     "reopen" => handle_hub_issue_reopen(rest)
     "comment" => handle_hub_issue_comment(rest)
     "link" => handle_hub_issue_link(rest)
+    "dep" => handle_hub_issue_dep(rest)
     "claim" => handle_hub_issue_claim(rest)
     "unclaim" => handle_hub_issue_unclaim(rest)
     "claims" => handle_hub_issue_claims(rest)
@@ -1335,6 +1339,85 @@ async fn handle_hub_issue_link(args : Array[String]) -> Unit raise Error {
   }
 }
 
+///|
+async fn handle_hub_issue_dep(args : Array[String]) -> Unit raise Error {
+  if args.length() == 0 {
+    eprint_line("usage: bit issue dep <add|remove|list> ...")
+    @sys.exit(1)
+  }
+  let subcmd = args[0]
+  let rest = collect_args(args, 1)
+  match subcmd {
+    "add" => {
+      if rest.length() < 2 {
+        eprint_line("usage: bit issue dep add <issue-id> <blocked-by-id>")
+        @sys.exit(1)
+      }
+      let source_id = rest[0]
+      let target_id = rest[1]
+      let root = get_work_root()
+      let git_dir = resolve_hub_git_dir(root)
+      ensure_hub_initialized(git_dir, command_name="issue dep add")
+      let (objects, refs, clock) = make_hub_stores(git_dir)
+      let hub = load_hub_store(objects, refs)
+      hub.add_dep(objects, refs, clock, source_id, target_id)
+      print_line("Issue #\{source_id} is now blocked by #\{target_id}")
+    }
+    "remove" | "rm" => {
+      if rest.length() < 2 {
+        eprint_line("usage: bit issue dep remove <issue-id> <blocked-by-id>")
+        @sys.exit(1)
+      }
+      let source_id = rest[0]
+      let target_id = rest[1]
+      let root = get_work_root()
+      let git_dir = resolve_hub_git_dir(root)
+      ensure_hub_initialized(git_dir, command_name="issue dep remove")
+      let (objects, refs, clock) = make_hub_stores(git_dir)
+      let hub = load_hub_store(objects, refs)
+      hub.remove_dep(objects, refs, clock, source_id, target_id)
+      print_line("Removed dependency: #\{source_id} is no longer blocked by #\{target_id}")
+    }
+    "list" | "ls" => {
+      if rest.length() < 1 {
+        eprint_line("usage: bit issue dep list <issue-id>")
+        @sys.exit(1)
+      }
+      let issue_id = rest[0]
+      let root = get_work_root()
+      let git_dir = resolve_hub_git_dir(root)
+      ensure_hub_initialized(git_dir, command_name="issue dep list")
+      let (objects, refs, _clock) = make_hub_stores(git_dir)
+      let hub = load_hub_store(objects, refs)
+      let issue = hub.get_issue(objects, issue_id)
+      guard issue is Some(iss) else {
+        eprint_line("error: issue not found: \{issue_id}")
+        @sys.exit(1)
+      }
+      if iss.blocked_by.length() > 0 {
+        print_line("Blocked by:")
+        for id in iss.blocked_by {
+          print_line("  #\{id}")
+        }
+      }
+      if iss.blocking.length() > 0 {
+        print_line("Blocking:")
+        for id in iss.blocking {
+          print_line("  #\{id}")
+        }
+      }
+      if iss.blocked_by.length() == 0 && iss.blocking.length() == 0 {
+        print_line("No dependencies")
+      }
+    }
+    _ => {
+      eprint_line("bit issue dep: unknown subcommand '\{subcmd}'")
+      eprint_line("usage: bit issue dep <add|remove|list> ...")
+      @sys.exit(1)
+    }
+  }
+}
+
 ///|
 async fn handle_hub_issue_claim(args : Array[String]) -> Unit raise Error {
   let mut issue_id : String? = None
diff --git a/modules/bit/src/cmd/bit/rebase.mbt b/modules/bit/src/cmd/bit/rebase.mbt
index 5db5f5f6..643e1b28 100644
--- a/modules/bit/src/cmd/bit/rebase.mbt
+++ b/modules/bit/src/cmd/bit/rebase.mbt
@@ -63,7 +63,7 @@ fn rebase_signing_override(args : Array[String]) -> Bool? {
 ///|
 fn rebase_uses_rebase_merges_mode(args : Array[String]) -> Bool {
   for arg in args {
-    if arg == "--rebase-merges" || arg.has_prefix("--rebase-merges=") {
+    if arg == "--rebase-merges" || arg == "--preserve-merges" || arg.has_prefix("--rebase-merges=") {
       return true
     }
   }
@@ -584,7 +584,7 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
         root_mode = true
         i += 1
       }
-      "--rebase-merges" => {
+      "--rebase-merges" | "--preserve-merges" => {
         rebase_merges = true
         interactive = true // --rebase-merges implies -i
         i += 1
diff --git a/modules/bit_lib/src/rebase.mbt b/modules/bit_lib/src/rebase.mbt
index 62075378..b0e071a5 100644
--- a/modules/bit_lib/src/rebase.mbt
+++ b/modules/bit_lib/src/rebase.mbt
@@ -882,6 +882,8 @@ fn save_rebase_state(
   match state.current {
     Some(id) => {
       fs.write_string(join_path(state_dir, "stopped-sha"), id.to_hex() + "\n")
+      // REBASE_HEAD points to the commit being applied (used by hooks/tools)
+      fs.write_string(join_path(git_dir, "REBASE_HEAD"), id.to_hex() + "\n")
       fs.write_string(join_path(state_dir, "message"), state.message)
       fs.write_string(
         join_path(state_dir, "author-script"),
@@ -1009,6 +1011,13 @@ pub fn clear_rebase_state(
   fs.remove_dir(state_dir) catch {
     _ => ()
   }
+  // Remove REBASE_HEAD from git_dir root (written on conflict)
+  let rebase_head = join_path(git_dir, "REBASE_HEAD")
+  if rfs.is_file(rebase_head) {
+    fs.remove_file(rebase_head) catch {
+      _ => ()
+    }
+  }
 }
 
 ///|
diff --git a/modules/bitx_hub/src/format.mbt b/modules/bitx_hub/src/format.mbt
index c5c4cd6a..bc4b98d3 100644
--- a/modules/bitx_hub/src/format.mbt
+++ b/modules/bitx_hub/src/format.mbt
@@ -218,6 +218,16 @@ pub fn WorkItem::serialize(self : WorkItem) -> String {
     }
     None => ()
   }
+  for id in self.blocked_by {
+    sb.write_string("blocked-by ")
+    sb.write_string(id)
+    sb.write_char('\n')
+  }
+  for id in self.blocking {
+    sb.write_string("blocking ")
+    sb.write_string(id)
+    sb.write_char('\n')
+  }
   match self.patch {
     None => ()
     Some(patch) => {
@@ -291,6 +301,8 @@ pub fn parse_work_item(text : String) -> WorkItem raise PrError {
   let closes_issues : Array[String] = []
   let mut merge_commit : @bit.ObjectId? = None
   let mut parent_id : String? = None
+  let blocked_by : Array[String] = []
+  let blocking : Array[String] = []
   let body_lines : Array[String] = []
   let mut in_body = false
   for line_view in text.split("\n") {
@@ -325,6 +337,8 @@ pub fn parse_work_item(text : String) -> WorkItem raise PrError {
           "linked-pr" => linked_prs.push(value)
           "linked-issue" => linked_issues.push(value)
           "parent" => parent_id = Some(value)
+          "blocked-by" => blocked_by.push(value)
+          "blocking" => blocking.push(value)
           "source" => source_branch = Some(value)
           "source-repo" => source_repo = Some(value)
           "source-ref" => source_ref = Some(value)
@@ -385,6 +399,8 @@ pub fn parse_work_item(text : String) -> WorkItem raise PrError {
     linked_issues~,
     patch~,
     parent_id~,
+    blocked_by~,
+    blocking~,
   )
 }
 
@@ -698,6 +714,16 @@ pub fn Issue::serialize(self : Issue) -> String {
     }
     None => ()
   }
+  for id in self.blocked_by {
+    sb.write_string("blocked-by ")
+    sb.write_string(id)
+    sb.write_char('\n')
+  }
+  for id in self.blocking {
+    sb.write_string("blocking ")
+    sb.write_string(id)
+    sb.write_char('\n')
+  }
   sb.write_char('\n')
   sb.write_string(self.body)
   sb.to_string()
@@ -717,6 +743,8 @@ pub fn parse_legacy_issue(text : String) -> Issue raise PrError {
   let linked_prs : Array[String] = []
   let linked_issues : Array[String] = []
   let mut parent_id : String? = None
+  let blocked_by : Array[String] = []
+  let blocking : Array[String] = []
   let body_lines : Array[String] = []
   let mut in_body = false
   for line_view in text.split("\n") {
@@ -751,6 +779,8 @@ pub fn parse_legacy_issue(text : String) -> Issue raise PrError {
           "linked-pr" => linked_prs.push(value)
           "linked-issue" => linked_issues.push(value)
           "parent" => parent_id = Some(value)
+          "blocked-by" => blocked_by.push(value)
+          "blocking" => blocking.push(value)
           _ => ()
         }
       }
@@ -772,6 +802,8 @@ pub fn parse_legacy_issue(text : String) -> Issue raise PrError {
     linked_prs~,
     linked_issues~,
     parent_id~,
+    blocked_by~,
+    blocking~,
   )
 }
 
diff --git a/modules/bitx_hub/src/issue.mbt b/modules/bitx_hub/src/issue.mbt
index 769360b5..6d04b649 100644
--- a/modules/bitx_hub/src/issue.mbt
+++ b/modules/bitx_hub/src/issue.mbt
@@ -131,7 +131,10 @@ pub fn Hub::update_issue(
     labels=new_labels,
     assignees=new_assignees,
     linked_prs=existing.linked_prs,
+    linked_issues=existing.linked_issues,
     parent_id=existing.parent_id,
+    blocked_by=existing.blocked_by,
+    blocking=existing.blocking,
   )
   ignore(
     self.store.put_record(
@@ -412,6 +415,8 @@ pub fn Hub::link_issue(
     linked_prs=existing.linked_prs,
     linked_issues=linked,
     parent_id=existing.parent_id,
+    blocked_by=existing.blocked_by,
+    blocking=existing.blocking,
   )
   ignore(
     self.store.put_record(
@@ -470,3 +475,98 @@ pub fn Hub::link_pr_to_issue(
 }
 
 ///|
+/// Add a dependency relationship between two issues.
+/// `source_id` is blocked by `target_id`.
+/// Both issues are updated in separate put_record calls.
+pub fn Hub::add_dep(
+  self : Hub,
+  objects : &@lib.ObjectStore,
+  refs : &@lib.RefStore,
+  clock : &@lib.Clock,
+  source_id : String,
+  target_id : String,
+) -> Unit raise @bit.GitError {
+  let source = self.get_issue(objects, source_id)
+  guard source is Some(src) else {
+    raise @bit.GitError::InvalidObject("Issue not found: \{source_id}")
+  }
+  let target = self.get_issue(objects, target_id)
+  guard target is Some(tgt) else {
+    raise @bit.GitError::InvalidObject("Issue not found: \{target_id}")
+  }
+  if !src.blocked_by.contains(target_id) {
+    let new_blocked_by = src.blocked_by.copy()
+    new_blocked_by.push(target_id)
+    let updated_src = Issue::new(
+      src.id, src.title, src.body, src.author,
+      src.created_at, clock.now(), src.state,
+      labels=src.labels, assignees=src.assignees,
+      linked_prs=src.linked_prs, linked_issues=src.linked_issues,
+      parent_id=src.parent_id,
+      blocked_by=new_blocked_by, blocking=src.blocking,
+    )
+    ignore(self.store.put_record(objects, refs, clock,
+      work_item_meta_key(source_id), canonical_work_item_record_kind(),
+      updated_src.to_work_item().serialize(), src.author))
+  }
+  if !tgt.blocking.contains(source_id) {
+    let new_blocking = tgt.blocking.copy()
+    new_blocking.push(source_id)
+    let updated_tgt = Issue::new(
+      tgt.id, tgt.title, tgt.body, tgt.author,
+      tgt.created_at, clock.now(), tgt.state,
+      labels=tgt.labels, assignees=tgt.assignees,
+      linked_prs=tgt.linked_prs, linked_issues=tgt.linked_issues,
+      parent_id=tgt.parent_id,
+      blocked_by=tgt.blocked_by, blocking=new_blocking,
+    )
+    ignore(self.store.put_record(objects, refs, clock,
+      work_item_meta_key(target_id), canonical_work_item_record_kind(),
+      updated_tgt.to_work_item().serialize(), tgt.author))
+  }
+}
+
+///|
+/// Remove a dependency relationship between two issues.
+/// `source_id` is no longer blocked by `target_id`.
+pub fn Hub::remove_dep(
+  self : Hub,
+  objects : &@lib.ObjectStore,
+  refs : &@lib.RefStore,
+  clock : &@lib.Clock,
+  source_id : String,
+  target_id : String,
+) -> Unit raise @bit.GitError {
+  let source = self.get_issue(objects, source_id)
+  guard source is Some(src) else {
+    raise @bit.GitError::InvalidObject("Issue not found: \{source_id}")
+  }
+  let target = self.get_issue(objects, target_id)
+  guard target is Some(tgt) else {
+    raise @bit.GitError::InvalidObject("Issue not found: \{target_id}")
+  }
+  let new_blocked_by = src.blocked_by.filter(fn(id) { id != target_id })
+  let updated_src = Issue::new(
+    src.id, src.title, src.body, src.author,
+    src.created_at, clock.now(), src.state,
+    labels=src.labels, assignees=src.assignees,
+    linked_prs=src.linked_prs, linked_issues=src.linked_issues,
+    parent_id=src.parent_id,
+    blocked_by=new_blocked_by, blocking=src.blocking,
+  )
+  ignore(self.store.put_record(objects, refs, clock,
+    work_item_meta_key(source_id), canonical_work_item_record_kind(),
+    updated_src.to_work_item().serialize(), src.author))
+  let new_blocking = tgt.blocking.filter(fn(id) { id != source_id })
+  let updated_tgt = Issue::new(
+    tgt.id, tgt.title, tgt.body, tgt.author,
+    tgt.created_at, clock.now(), tgt.state,
+    labels=tgt.labels, assignees=tgt.assignees,
+    linked_prs=tgt.linked_prs, linked_issues=tgt.linked_issues,
+    parent_id=tgt.parent_id,
+    blocked_by=tgt.blocked_by, blocking=new_blocking,
+  )
+  ignore(self.store.put_record(objects, refs, clock,
+    work_item_meta_key(target_id), canonical_work_item_record_kind(),
+    updated_tgt.to_work_item().serialize(), tgt.author))
+}
diff --git a/modules/bitx_hub/src/types.mbt b/modules/bitx_hub/src/types.mbt
index 85029120..7fd90e4d 100644
--- a/modules/bitx_hub/src/types.mbt
+++ b/modules/bitx_hub/src/types.mbt
@@ -351,6 +351,8 @@ pub struct WorkItem {
   linked_issues : Array[String]
   patch : WorkItemPatch?
   parent_id : String?
+  blocked_by : Array[String]
+  blocking : Array[String]
 }
 
 ///|
@@ -368,6 +370,8 @@ pub fn WorkItem::new(
   linked_issues? : Array[String] = [],
   patch? : WorkItemPatch? = None,
   parent_id? : String? = None,
+  blocked_by? : Array[String] = [],
+  blocking? : Array[String] = [],
 ) -> WorkItem {
   {
     id,
@@ -383,6 +387,8 @@ pub fn WorkItem::new(
     linked_issues,
     patch,
     parent_id,
+    blocked_by,
+    blocking,
   }
 }
 
@@ -449,6 +455,16 @@ pub fn WorkItem::linked_issues(self : WorkItem) -> Array[String] {
   self.linked_issues
 }
 
+///|
+pub fn WorkItem::blocked_by(self : WorkItem) -> Array[String] {
+  self.blocked_by
+}
+
+///|
+pub fn WorkItem::blocking(self : WorkItem) -> Array[String] {
+  self.blocking
+}
+
 ///|
 pub fn WorkItem::patch(self : WorkItem) -> WorkItemPatch? {
   self.patch
@@ -504,6 +520,8 @@ pub fn WorkItem::to_issue(self : WorkItem) -> Issue? {
               linked_prs=self.linked_prs,
               linked_issues=self.linked_issues,
               parent_id=self.parent_id,
+              blocked_by=self.blocked_by,
+              blocking=self.blocking,
             ),
           )
       }
@@ -725,6 +743,8 @@ pub struct Issue {
   linked_prs : Array[String] // Related PRs
   linked_issues : Array[String] // Cross-repo issue references
   parent_id : String?
+  blocked_by : Array[String] // Issues that block this one
+  blocking : Array[String] // Issues this one blocks
 }
 
 ///|
@@ -741,6 +761,8 @@ pub fn Issue::new(
   linked_prs? : Array[String] = [],
   linked_issues? : Array[String] = [],
   parent_id? : String? = None,
+  blocked_by? : Array[String] = [],
+  blocking? : Array[String] = [],
 ) -> Issue {
   {
     id,
@@ -755,6 +777,8 @@ pub fn Issue::new(
     linked_prs,
     linked_issues,
     parent_id,
+    blocked_by,
+    blocking,
   }
 }
 
@@ -813,6 +837,16 @@ pub fn Issue::linked_issues(self : Issue) -> Array[String] {
   self.linked_issues
 }
 
+///|
+pub fn Issue::blocked_by(self : Issue) -> Array[String] {
+  self.blocked_by
+}
+
+///|
+pub fn Issue::blocking(self : Issue) -> Array[String] {
+  self.blocking
+}
+
 ///|
 pub fn Issue::to_work_item(self : Issue) -> WorkItem {
   WorkItem::new(
@@ -828,6 +862,8 @@ pub fn Issue::to_work_item(self : Issue) -> WorkItem {
     linked_prs=self.linked_prs,
     linked_issues=self.linked_issues,
     parent_id=self.parent_id,
+    blocked_by=self.blocked_by,
+    blocking=self.blocking,
   )
 }
 

From 6c65a1a6e5db6012cae4823204f6b94f03204095 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 06:39:32 +0000
Subject: [PATCH 6/7] fix(#88,#86,#29): rebase backend flags, subject:sanitize,
 wbtest fixture constants

#88: Accept --apply/--merge backend selection flags and rebase.backend
config value; bit uses a unified backend so these are no-ops needed for
git compat tests (GIT_TEST_REBASE_USE_BUILTIN_BACKEND).

#86: Fix %(subject:sanitize) to replace all non-filename-safe characters
(not just spaces) with a single '-' and strip trailing dashes, matching
git's ref-filter behavior.

#29: Extract component_impl_fixture_remote_url and
component_impl_fixture_default_branch constants; add
component_impl_assert_remote_fetch_target() helper; update all
component/impl wbtests to use these constants instead of inline strings.

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 .../impl/network_clone_bootstrap_wbtest.mbt   |  4 ++--
 .../impl/network_clone_config_wbtest.mbt      |  4 ++--
 component/impl/network_clone_wbtest.mbt       |  2 +-
 component/impl/network_discovery_wbtest.mbt   |  2 +-
 component/impl/network_fetch_ops_wbtest.mbt   |  2 +-
 component/impl/network_fetch_pack_wbtest.mbt  |  2 +-
 .../network_fixture_codec_helpers_wbtest.mbt  |  6 +++++
 .../impl/network_push_exchange_wbtest.mbt     |  2 +-
 component/impl/network_push_ops_wbtest.mbt    |  2 +-
 component/impl/network_push_sync_wbtest.mbt   |  2 +-
 .../network_receive_pack_request_wbtest.mbt   |  4 ++--
 ...k_receive_pack_response_fixture_wbtest.mbt |  4 ++--
 .../impl/network_remote_fetch_wbtest.mbt      |  6 ++---
 component/impl/network_remote_wbtest.mbt      |  2 +-
 ...epo_fetch_state_fixture_helpers_wbtest.mbt | 11 +++++++++
 component/impl/network_repo_sync_wbtest.mbt   |  2 +-
 ...etwork_upload_pack_http_request_wbtest.mbt |  4 ++--
 ...k_upload_pack_transport_fixture_wbtest.mbt |  4 ++--
 modules/bit/src/cmd/bit/for_each_ref.mbt      | 24 +++++++++++++++----
 modules/bit/src/cmd/bit/rebase.mbt            |  8 +++++++
 20 files changed, 68 insertions(+), 29 deletions(-)

diff --git a/component/impl/network_clone_bootstrap_wbtest.mbt b/component/impl/network_clone_bootstrap_wbtest.mbt
index 51b27b7f..4b20218b 100644
--- a/component/impl/network_clone_bootstrap_wbtest.mbt
+++ b/component/impl/network_clone_bootstrap_wbtest.mbt
@@ -2,14 +2,14 @@
 test "component impl: clone bootstrap helpers initialize repo and origin config" {
   let fs = @bit.TestFs::new()
 
-  net_prepare_clone_repo(fs, "/repo", "git@github.com:user/repo.git")
+  net_prepare_clone_repo(fs, "/repo", component_impl_fixture_remote_url)
 
   assert_true(fs.is_dir("/repo"))
   assert_true(fs.is_dir("/repo/.git"))
   let config = fs.read_string("/repo/.git/config")
   inspect(config.contains("[remote \"origin\"]"), content="true")
   inspect(
-    config.contains("\turl = git@github.com:user/repo.git"),
+    config.contains("\turl = " + component_impl_fixture_remote_url),
     content="true",
   )
 }
diff --git a/component/impl/network_clone_config_wbtest.mbt b/component/impl/network_clone_config_wbtest.mbt
index 15093e0c..53404a6e 100644
--- a/component/impl/network_clone_config_wbtest.mbt
+++ b/component/impl/network_clone_config_wbtest.mbt
@@ -4,13 +4,13 @@ test "component impl: clone config helpers write origin remote config" {
   @bitlib.init_repo(fs, "/repo")
 
   net_write_clone_remote_config(
-    fs, "/repo/.git", "git@github.com:user/repo.git",
+    fs, "/repo/.git", component_impl_fixture_remote_url,
   )
 
   let config = fs.read_string("/repo/.git/config")
   inspect(config.contains("[remote \"origin\"]"), content="true")
   inspect(
-    config.contains("\turl = git@github.com:user/repo.git"),
+    config.contains("\turl = " + component_impl_fixture_remote_url),
     content="true",
   )
   inspect(
diff --git a/component/impl/network_clone_wbtest.mbt b/component/impl/network_clone_wbtest.mbt
index 592caf7f..8c5e5190 100644
--- a/component/impl/network_clone_wbtest.mbt
+++ b/component/impl/network_clone_wbtest.mbt
@@ -5,7 +5,7 @@ test "component impl: clone_with_transport materializes repo with injected trans
   clone_with_transport(
     fs,
     fs,
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     "/repo",
     "",
     0,
diff --git a/component/impl/network_discovery_wbtest.mbt b/component/impl/network_discovery_wbtest.mbt
index 47d094bb..7183400f 100644
--- a/component/impl/network_discovery_wbtest.mbt
+++ b/component/impl/network_discovery_wbtest.mbt
@@ -4,7 +4,7 @@ test "component impl: discover refs accepts scp-style ssh remote" {
   let get_calls : Array[String] = []
   let post_calls : Array[String] = []
   let (refs, _caps, version, symrefs) = discover_refs_sync(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     true,
     fn(
       url : String,
diff --git a/component/impl/network_fetch_ops_wbtest.mbt b/component/impl/network_fetch_ops_wbtest.mbt
index fb75278d..d1d60172 100644
--- a/component/impl/network_fetch_ops_wbtest.mbt
+++ b/component/impl/network_fetch_ops_wbtest.mbt
@@ -8,7 +8,7 @@ test "component impl: fetch_with_transport materializes fetched state" {
     fs,
     fs,
     "/repo",
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     fn(
       _url : String,
       _headers : Map[String, String],
diff --git a/component/impl/network_fetch_pack_wbtest.mbt b/component/impl/network_fetch_pack_wbtest.mbt
index 3df42eae..dd1a34f0 100644
--- a/component/impl/network_fetch_pack_wbtest.mbt
+++ b/component/impl/network_fetch_pack_wbtest.mbt
@@ -3,7 +3,7 @@ test "component impl: fetch_pack_sync returns pack payload through injected tran
   let (adv, lsrefs, fetch) = component_impl_fixture_upload_pack_responses()
 
   let pack = fetch_pack_sync(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     [@bit.ObjectId::from_hex(component_impl_fixture_commit)],
     true,
     0,
diff --git a/component/impl/network_fixture_codec_helpers_wbtest.mbt b/component/impl/network_fixture_codec_helpers_wbtest.mbt
index f0fc94ac..117c964c 100644
--- a/component/impl/network_fixture_codec_helpers_wbtest.mbt
+++ b/component/impl/network_fixture_codec_helpers_wbtest.mbt
@@ -56,3 +56,9 @@ let component_impl_fetch_hex : String = "303030647061636b66696c650a3030643501504
 
 ///|
 let component_impl_fixture_commit : String = "30c9f208acc7601773a29aef394157adf960d104"
+
+///|
+let component_impl_fixture_remote_url : String = "git@github.com:user/repo.git"
+
+///|
+let component_impl_fixture_default_branch : String = "refs/heads/main"
diff --git a/component/impl/network_push_exchange_wbtest.mbt b/component/impl/network_push_exchange_wbtest.mbt
index 887eb97e..42d58481 100644
--- a/component/impl/network_push_exchange_wbtest.mbt
+++ b/component/impl/network_push_exchange_wbtest.mbt
@@ -4,7 +4,7 @@ test "component impl: push exchange helpers execute receive-pack flow" {
   let get_calls : Array[String] = []
   let post_calls : Array[String] = []
   let result = net_execute_push_request(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     "refs/heads/main",
     @bit.ObjectId::from_hex(component_impl_fixture_commit),
     Bytes::from_array([1, 2, 3, 4]),
diff --git a/component/impl/network_push_ops_wbtest.mbt b/component/impl/network_push_ops_wbtest.mbt
index e038fcd8..42aea96e 100644
--- a/component/impl/network_push_ops_wbtest.mbt
+++ b/component/impl/network_push_ops_wbtest.mbt
@@ -10,7 +10,7 @@ test "component impl: push_with_transport accepts scp-style ssh remote" {
   let result = push_with_transport(
     fs,
     "/repo",
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     "",
     fn(
       url : String,
diff --git a/component/impl/network_push_sync_wbtest.mbt b/component/impl/network_push_sync_wbtest.mbt
index 8fc71f7d..919d23ae 100644
--- a/component/impl/network_push_sync_wbtest.mbt
+++ b/component/impl/network_push_sync_wbtest.mbt
@@ -10,7 +10,7 @@ test "component impl: push sync helpers prepare state and execute request" {
   let result = net_sync_push_target(
     fs,
     "/repo",
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     "",
     fn(
       url : String,
diff --git a/component/impl/network_receive_pack_request_wbtest.mbt b/component/impl/network_receive_pack_request_wbtest.mbt
index f299ae3b..23690d1d 100644
--- a/component/impl/network_receive_pack_request_wbtest.mbt
+++ b/component/impl/network_receive_pack_request_wbtest.mbt
@@ -1,12 +1,12 @@
 ///|
 test "component impl: receive-pack request helpers normalize ssh remote" {
   let (info_url, info_headers) = receive_pack_info_refs_request(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
   )
 
   let pack = Bytes::from_array([1, 2, 3, 4])
   let (push_url, push_body, push_headers) = receive_pack_service_request(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     @bit.ObjectId::from_hex(component_impl_fixture_commit),
     @bit.ObjectId::zero(),
     "refs/heads/main",
diff --git a/component/impl/network_receive_pack_response_fixture_wbtest.mbt b/component/impl/network_receive_pack_response_fixture_wbtest.mbt
index fb376e77..46d70539 100644
--- a/component/impl/network_receive_pack_response_fixture_wbtest.mbt
+++ b/component/impl/network_receive_pack_response_fixture_wbtest.mbt
@@ -1,11 +1,11 @@
 ///|
 test "component impl: receive-pack response fixture helpers assert request and response expectations" {
   let (receive_info_url, receive_info_headers) = receive_pack_info_refs_request(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
   )
   let pack = Bytes::from_array([1, 2, 3, 4])
   let (push_url, push_body, push_headers) = receive_pack_service_request(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     @bit.ObjectId::from_hex(component_impl_fixture_commit),
     @bit.ObjectId::zero(),
     "refs/heads/main",
diff --git a/component/impl/network_remote_fetch_wbtest.mbt b/component/impl/network_remote_fetch_wbtest.mbt
index 8c8b727a..223b3e7a 100644
--- a/component/impl/network_remote_fetch_wbtest.mbt
+++ b/component/impl/network_remote_fetch_wbtest.mbt
@@ -3,7 +3,7 @@ test "component impl: remote fetch helpers choose default target and fetch pack"
   let (adv, lsrefs, fetch) = component_impl_fixture_upload_pack_responses()
 
   let (refname, commit_id, pack) = net_fetch_remote_target(
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     0,
     "No default branch found",
     fn(
@@ -29,7 +29,5 @@ test "component impl: remote fetch helpers choose default target and fetch pack"
     },
   )
 
-  assert_eq(refname, "refs/heads/main")
-  inspect(commit_id.to_hex(), content=component_impl_fixture_commit)
-  assert_true(pack.length() > 0)
+  component_impl_assert_remote_fetch_target(refname, commit_id, pack)
 }
diff --git a/component/impl/network_remote_wbtest.mbt b/component/impl/network_remote_wbtest.mbt
index 7ce10601..c4e0fbc7 100644
--- a/component/impl/network_remote_wbtest.mbt
+++ b/component/impl/network_remote_wbtest.mbt
@@ -5,7 +5,7 @@ test "component impl: network remote helpers normalize ssh remotes" {
     content="https://github.com/mizchi/bit-vcs.git",
   )
 
-  let remote = net_http_remote("git@github.com:user/repo.git")
+  let remote = net_http_remote(component_impl_fixture_remote_url)
   inspect(
     remote.info_refs_url(),
     content="https://github.com/user/repo/info/refs?service=git-receive-pack",
diff --git a/component/impl/network_repo_fetch_state_fixture_helpers_wbtest.mbt b/component/impl/network_repo_fetch_state_fixture_helpers_wbtest.mbt
index 9c504483..3e87de4c 100644
--- a/component/impl/network_repo_fetch_state_fixture_helpers_wbtest.mbt
+++ b/component/impl/network_repo_fetch_state_fixture_helpers_wbtest.mbt
@@ -16,3 +16,14 @@ fn component_impl_assert_fetch_only_state(
   )
   assert_eq(fs.read_string(root + "/hello.txt"), "hello\n")
 }
+
+///|
+fn component_impl_assert_remote_fetch_target(
+  refname : String,
+  commit_id : @bit.ObjectId,
+  pack : Bytes,
+) -> Unit {
+  assert_eq(refname, component_impl_fixture_default_branch)
+  inspect(commit_id.to_hex(), content=component_impl_fixture_commit)
+  assert_true(pack.length() > 0)
+}
diff --git a/component/impl/network_repo_sync_wbtest.mbt b/component/impl/network_repo_sync_wbtest.mbt
index ab8526d8..f4a920a4 100644
--- a/component/impl/network_repo_sync_wbtest.mbt
+++ b/component/impl/network_repo_sync_wbtest.mbt
@@ -8,7 +8,7 @@ test "component impl: repo sync helpers fetch remote target and apply fetched st
     fs,
     fs,
     "/repo",
-    "git@github.com:user/repo.git",
+    component_impl_fixture_remote_url,
     0,
     "No refs found on remote",
     fn(
diff --git a/component/impl/network_upload_pack_http_request_wbtest.mbt b/component/impl/network_upload_pack_http_request_wbtest.mbt
index 7c3b475d..1274f7af 100644
--- a/component/impl/network_upload_pack_http_request_wbtest.mbt
+++ b/component/impl/network_upload_pack_http_request_wbtest.mbt
@@ -1,10 +1,10 @@
 ///|
 test "component impl: upload-pack http request helpers normalize ssh remote" {
   let (info_url, info_headers) = upload_pack_info_refs_request(
-    "git@github.com:user/repo.git", true,
+    component_impl_fixture_remote_url, true,
   )
   let (post_url, post_headers) = upload_pack_service_request(
-    "git@github.com:user/repo.git", true,
+    component_impl_fixture_remote_url, true,
   )
   component_impl_assert_upload_pack_request(
     info_url, info_headers, post_url, post_headers, "https://github.com/user/repo",
diff --git a/component/impl/network_upload_pack_transport_fixture_wbtest.mbt b/component/impl/network_upload_pack_transport_fixture_wbtest.mbt
index 38e3fe1a..7f4a2d6e 100644
--- a/component/impl/network_upload_pack_transport_fixture_wbtest.mbt
+++ b/component/impl/network_upload_pack_transport_fixture_wbtest.mbt
@@ -33,10 +33,10 @@ test "component impl: upload-pack transport fixture helpers assert request expec
   )
 
   let (upload_info_url, upload_info_headers) = upload_pack_info_refs_request(
-    "git@github.com:user/repo.git", true,
+    component_impl_fixture_remote_url, true,
   )
   let (upload_post_url, upload_post_headers) = upload_pack_service_request(
-    "git@github.com:user/repo.git", true,
+    component_impl_fixture_remote_url, true,
   )
   component_impl_assert_upload_pack_request(
     upload_info_url, upload_info_headers, upload_post_url, upload_post_headers, "https://github.com/user/repo",
diff --git a/modules/bit/src/cmd/bit/for_each_ref.mbt b/modules/bit/src/cmd/bit/for_each_ref.mbt
index 69a16725..eb8a0711 100644
--- a/modules/bit/src/cmd/bit/for_each_ref.mbt
+++ b/modules/bit/src/cmd/bit/for_each_ref.mbt
@@ -4229,15 +4229,31 @@ async fn for_each_ref_commit_atom(
     }
     "subject" => subject
     "subject:sanitize" => {
+      // Replace runs of non-filename-safe chars with a single '-', like git does
       let sb = StringBuilder::new()
+      let mut last_was_dash = false
       for c in subject {
-        if c == ' ' {
-          sb.write_char('-')
-        } else {
+        let code = c.to_int()
+        // Safe chars: alphanumerics and a few punctuation chars
+        let safe = (code >= 'a'.to_int() && code <= 'z'.to_int()) ||
+          (code >= 'A'.to_int() && code <= 'Z'.to_int()) ||
+          (code >= '0'.to_int() && code <= '9'.to_int()) ||
+          c == '.' || c == '_'
+        if safe {
           sb.write_char(c)
+          last_was_dash = false
+        } else if !last_was_dash {
+          sb.write_char('-')
+          last_was_dash = true
         }
       }
-      sb.to_string()
+      // Strip trailing dash
+      let s = sb.to_string()
+      if s.has_suffix("-") {
+        String::unsafe_substring(s, start=0, end=s.length() - 1)
+      } else {
+        s
+      }
     }
     _ if atom.has_prefix("subject:") => {
       let arg = String::unsafe_substring(atom, start=8, end=atom.length())
diff --git a/modules/bit/src/cmd/bit/rebase.mbt b/modules/bit/src/cmd/bit/rebase.mbt
index 643e1b28..ca8f5b2a 100644
--- a/modules/bit/src/cmd/bit/rebase.mbt
+++ b/modules/bit/src/cmd/bit/rebase.mbt
@@ -559,6 +559,10 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
         force_rebase = false
         i += 1
       }
+      // Backend selection flags: bit has a single backend so these are accepted
+      // and ignored for git compatibility (e.g. GIT_TEST_REBASE_USE_BUILTIN_BACKEND)
+      "--apply" | "--merge" => i += 1
+      _ if arg.has_prefix("--backend=") => i += 1
       "--exec" | "-x" if i + 1 < args.length() => {
         exec_cmds.push(args[i + 1])
         interactive = true // --exec implies -i
@@ -799,6 +803,10 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
     }
     return ()
   }
+  // rebase.backend config (apply/ort): bit has a unified backend, accept and ignore
+  ignore(
+    @bitlib.read_config_value(rfs, git_dir + "/config", "rebase", "backend"),
+  )
   // Also check rebase.autoStash config
   if !autostash {
     match

From 6fe137c9b9ee3443a9e4ad50931c78a9de3b72f7 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 31 May 2026 07:32:53 +0000
Subject: [PATCH 7/7] fix(#86,#85,#88): for-each-ref filters, gc config, rebase
 compat flags
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#86: Add --merged/--no-merged/--points-at space-separated argument form
(--merged <ref> was accepted only as --merged=<ref>; bare --merged now
defaults to HEAD matching git behavior).

#85: Fix commit-graph reader date_hi bit extraction (bits 1-0, not 31-30)
matching the format written by the writer. Add gc.writeCommitGraph config
check — skip writing commit-graph when explicitly disabled.

#88: Silently accept --stat/--no-stat/--diffstat, --signoff, --ignore-
whitespace, --whitespace=, --empty=, --reschedule-failed-exec, --reset-
author-date, --committer-date-is-author-date, and read rebase.stat config
for compat with t3400 test variants.

https://claude.ai/code/session_0159rAapXhARokV9Si1wvgoa
---
 modules/bit/src/cmd/bit/for_each_ref.mbt    | 19 +++++++++++++++++++
 modules/bit/src/cmd/bit/gc.mbt              | 16 +++++++++++++---
 modules/bit/src/cmd/bit/rebase.mbt          | 14 ++++++++++++++
 modules/bit_lib/src/commit_graph_reader.mbt |  4 ++--
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/modules/bit/src/cmd/bit/for_each_ref.mbt b/modules/bit/src/cmd/bit/for_each_ref.mbt
index eb8a0711..5059a907 100644
--- a/modules/bit/src/cmd/bit/for_each_ref.mbt
+++ b/modules/bit/src/cmd/bit/for_each_ref.mbt
@@ -58,12 +58,31 @@ async fn handle_for_each_ref(args : Array[String]) -> Unit raise Error {
         points_at.push(
           String::unsafe_substring(arg, start=12, end=arg.length()),
         )
+      "--points-at" =>
+        if i + 1 < args.length() {
+          i += 1
+          points_at.push(args[i])
+        }
       _ if arg.has_prefix("--merged=") =>
         merged = Some(String::unsafe_substring(arg, start=9, end=arg.length()))
+      "--merged" =>
+        if i + 1 < args.length() && !args[i + 1].has_prefix("-") {
+          i += 1
+          merged = Some(args[i])
+        } else {
+          merged = Some("HEAD")
+        }
       _ if arg.has_prefix("--no-merged=") =>
         no_merged = Some(
           String::unsafe_substring(arg, start=12, end=arg.length()),
         )
+      "--no-merged" =>
+        if i + 1 < args.length() && !args[i + 1].has_prefix("-") {
+          i += 1
+          no_merged = Some(args[i])
+        } else {
+          no_merged = Some("HEAD")
+        }
       "--shell" | "-s" => {
         if quote_style != "" {
           eprint_line("error: more than one quoting style")
diff --git a/modules/bit/src/cmd/bit/gc.mbt b/modules/bit/src/cmd/bit/gc.mbt
index 1b5c7503..915d86c9 100644
--- a/modules/bit/src/cmd/bit/gc.mbt
+++ b/modules/bit/src/cmd/bit/gc.mbt
@@ -35,10 +35,20 @@ async fn handle_gc(args : Array[String]) -> Unit raise Error {
       print_line("Found \{result.dangling.length()} dangling objects")
     }
   }
-  // Update commit-graph after gc
+  // Update commit-graph after gc if gc.writeCommitGraph is enabled (default: true)
   let git_dir = resolve_git_dir(fs, root)
-  write_commit_graph(fs, git_dir, true) catch {
-    _ => ()
+  let rfs : &@bitcore.RepoFileSystem = fs
+  let write_cgraph = match
+    @bitlib.read_config_value(
+      rfs, git_dir + "/config", "gc", "writeCommitGraph",
+    ) {
+    Some(v) => v.to_lower() != "false"
+    None => true
+  }
+  if write_cgraph {
+    write_commit_graph(fs, git_dir, true) catch {
+      _ => ()
+    }
   }
 }
 
diff --git a/modules/bit/src/cmd/bit/rebase.mbt b/modules/bit/src/cmd/bit/rebase.mbt
index ca8f5b2a..249f1124 100644
--- a/modules/bit/src/cmd/bit/rebase.mbt
+++ b/modules/bit/src/cmd/bit/rebase.mbt
@@ -559,6 +559,9 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
         force_rebase = false
         i += 1
       }
+      // --stat/--no-stat/--diffstat/--no-diffstat: show diffstat after rebase
+      // bit does not yet show diffstats, accept for compatibility
+      "--stat" | "--diffstat" | "--no-stat" | "--no-diffstat" => i += 1
       // Backend selection flags: bit has a single backend so these are accepted
       // and ignored for git compatibility (e.g. GIT_TEST_REBASE_USE_BUILTIN_BACKEND)
       "--apply" | "--merge" => i += 1
@@ -625,6 +628,13 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
         onto = Some(args[i + 1])
         i += 2
       }
+      // Silently accepted compat flags
+      "--reschedule-failed-exec" | "--no-reschedule-failed-exec" => i += 1
+      "--reset-author-date" | "--ignore-date" | "--committer-date-is-author-date" => i += 1
+      "--signoff" | "--no-signoff" => i += 1
+      "--ignore-whitespace" => i += 1
+      _ if arg.has_prefix("--whitespace=") => i += 1
+      _ if arg.has_prefix("--empty=") => i += 1
       _ if !arg.has_prefix("-") => {
         upstream = Some(arg)
         i += 1
@@ -807,6 +817,10 @@ async fn handle_rebase(args : Array[String]) -> Unit raise Error {
   ignore(
     @bitlib.read_config_value(rfs, git_dir + "/config", "rebase", "backend"),
   )
+  // rebase.stat: bit does not yet show diffstats, accept config for compat
+  ignore(
+    @bitlib.read_config_value(rfs, git_dir + "/config", "rebase", "stat"),
+  )
   // Also check rebase.autoStash config
   if !autostash {
     match
diff --git a/modules/bit_lib/src/commit_graph_reader.mbt b/modules/bit_lib/src/commit_graph_reader.mbt
index 769b9b27..fe1cd838 100644
--- a/modules/bit_lib/src/commit_graph_reader.mbt
+++ b/modules/bit_lib/src/commit_graph_reader.mbt
@@ -150,8 +150,8 @@ pub fn CommitGraphFile::read_commit(
   let parent2_raw = cgraph_read_u32(self.data, entry + self.hash_size + 4)
   let gen_and_date = cgraph_read_u32(self.data, entry + self.hash_size + 8)
   let date_low = cgraph_read_u32(self.data, entry + self.hash_size + 12)
-  // Timestamp: upper 2 bits from gen_and_date[31:30], lower 32 from date_low
-  let date_hi = (gen_and_date >> 30) & 0x3
+  // Format: bits 31-2 = generation number, bits 1-0 = upper 2 bits of timestamp
+  let date_hi = gen_and_date & 0x3
   let timestamp = (date_hi.to_int64() << 32) |
     date_low.to_int64().land(0xffffffffL)
   // Parents