Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163

Closed
Closed
Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
Labels
documentationImprovements or additions to documentation

Description

@ptr727
ptr727
opened on Jun 21, 2026

Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:

1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify

The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.

Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:

FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main

(rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)

2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch

Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:

  • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
  • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.

3. Tags are orphaned by a root rewrite

A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.

4. Verify via the API, not local %G?

Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:

gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid

5. Post-rewrite cleanup

Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.

6. Minor

git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.

Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).

Metadata

Metadata

Assignees

No one assigned

    Labels

    documentationImprovements or additions to documentation

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions

      , 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
       blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

      Skip to content
      Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
      Closed
      Closed
      Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
      Labels
      documentationImprovements or additions to documentation
      Description
      @ptr727
      ptr727
      opened on Jun 21, 2026
      Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
      1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
      The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
      Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
      FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
      (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
      2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
      Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
      • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
      • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
      3. Tags are orphaned by a root rewrite
      A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
      4. Verify via the API, not local %G?
      Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
      gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
      5. Post-rewrite cleanup
      Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
      6. Minor
      git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
      Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
      Metadata
      Metadata
      Assignees
      No one assigned
        Labels
        documentationImprovements or additions to documentation
        Projects
        No projects
          Milestone
          No milestone
          Relationships
          None yet
          Development
          No branches or pull requests
          Issue actions
          
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

          Skip to content
          Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
          Closed
          Closed
          Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
          Labels
          documentationImprovements or additions to documentation
          Description
          @ptr727
          ptr727
          opened on Jun 21, 2026
          Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
          1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
          The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
          Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
          FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
          (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
          2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
          Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
          • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
          • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
          3. Tags are orphaned by a root rewrite
          A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
          4. Verify via the API, not local %G?
          Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
          gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
          5. Post-rewrite cleanup
          Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
          6. Minor
          git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
          Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
          Metadata
          Metadata
          Assignees
          No one assigned
            Labels
            documentationImprovements or additions to documentation
            Projects
            No projects
              Milestone
              No milestone
              Relationships
              None yet
              Development
              No branches or pull requests
              Issue actions
              
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

              Skip to content
              Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
              Closed
              Closed
              Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
              Labels
              documentationImprovements or additions to documentation
              Description
              @ptr727
              ptr727
              opened on Jun 21, 2026
              Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
              1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
              The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
              Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
              FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
              (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
              2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
              Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
              • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
              • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
              3. Tags are orphaned by a root rewrite
              A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
              4. Verify via the API, not local %G?
              Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
              gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
              5. Post-rewrite cleanup
              Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
              6. Minor
              git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
              Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
              Metadata
              Metadata
              Assignees
              No one assigned
                Labels
                documentationImprovements or additions to documentation
                Projects
                No projects
                  Milestone
                  No milestone
                  Relationships
                  None yet
                  Development
                  No branches or pull requests
                  Issue actions
                  
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

                  Skip to content
                  Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
                  Closed
                  Closed
                  Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
                  Labels
                  documentationImprovements or additions to documentation
                  Description
                  @ptr727
                  ptr727
                  opened on Jun 21, 2026
                  Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
                  1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
                  The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
                  Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
                  FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
                  (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
                  2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
                  Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
                  • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
                  • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
                  3. Tags are orphaned by a root rewrite
                  A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
                  4. Verify via the API, not local %G?
                  Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
                  gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
                  5. Post-rewrite cleanup
                  Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
                  6. Minor
                  git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
                  Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
                  Metadata
                  Metadata
                  Assignees
                  No one assigned
                    Labels
                    documentationImprovements or additions to documentation
                    Projects
                    No projects
                      Milestone
                      No milestone
                      Relationships
                      None yet
                      Development
                      No branches or pull requests
                      Issue actions
                      
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

                      Skip to content
                      Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
                      Closed
                      Closed
                      Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
                      Labels
                      documentationImprovements or additions to documentation
                      Description
                      @ptr727
                      ptr727
                      opened on Jun 21, 2026
                      Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
                      1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
                      The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
                      Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
                      FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
                      (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
                      2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
                      Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
                      • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
                      • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
                      3. Tags are orphaned by a root rewrite
                      A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
                      4. Verify via the API, not local %G?
                      Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
                      gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
                      5. Post-rewrite cleanup
                      Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
                      6. Minor
                      git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
                      Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
                      Metadata
                      Metadata
                      Assignees
                      No one assigned
                        Labels
                        documentationImprovements or additions to documentation
                        Projects
                        No projects
                          Milestone
                          No milestone
                          Relationships
                          None yet
                          Development
                          No branches or pull requests
                          Issue actions
                          
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

                          Skip to content
                          Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
                          Closed
                          Closed
                          Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
                          Labels
                          documentationImprovements or additions to documentation
                          Description
                          @ptr727
                          ptr727
                          opened on Jun 21, 2026
                          Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
                          1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
                          The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
                          Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
                          FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
                          (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
                          2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
                          Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
                          • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
                          • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
                          3. Tags are orphaned by a root rewrite
                          A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
                          4. Verify via the API, not local %G?
                          Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
                          gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
                          5. Post-rewrite cleanup
                          Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
                          6. Minor
                          git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
                          Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
                          Metadata
                          Metadata
                          Assignees
                          No one assigned
                            Labels
                            documentationImprovements or additions to documentation
                            Projects
                            No projects
                              Milestone
                              No milestone
                              Relationships
                              None yet
                              Development
                              No branches or pull requests
                              Issue actions
                              
, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

                              Skip to content
                              Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering #163
                              Closed
                              Closed
                              Brownfield re-sign: recommend filter-branch + committer rewrite, and clarify ruleset-blocking/ordering#163
                              Labels
                              documentationImprovements or additions to documentation
                              Description
                              @ptr727
                              ptr727
                              opened on Jun 21, 2026
                              Concrete findings from running the brownfield migration (README "Template - GitHub Setup") on a real repo (ptr727/ESPHome-NonRoot: ~123 commits/branch, 47 merges, 51 unsigned back to root, 82 tags). The procedure works but several things would have saved time / avoided footguns:
                              1. For merge-heavy history, prefer filter-branch - and it needs a committer rewrite to verify
                              The procedure lists git rebase --root --rebase-merges --exec 'git commit --amend --no-edit -S' as primary and filter-branch as a deprecated fallback. For a history with many merge commits, the rebase is fragile (complex todo, easy to derail); git filter-branch --commit-filter rewrites every commit object in place, preserving the exact DAG with zero conflicts, and operating on both refs at once keeps shared ancestry consistent (same new SHA on both branches). It was by far the smoother tool here.
                              Crucial caveat the docs omit:filter-branch's commit-filter preserves the original committer, so signing alone yields committer != signer and GitHub does not mark the commit Verified - which means Require signed commits still rejects it. You must rewrite the committer to the signing identity:
                              FILTER_BRANCH_SQUELCH_WARNING=1 git filter-branch --commit-filter ' GIT_COMMITTER_NAME="You" GIT_COMMITTER_EMAIL="you@users.noreply.github.com" git commit-tree -S "$@"' -- develop main
                              (rebase --amend -S sets committer to the rewriter automatically, which is why it verifies - worth stating explicitly so the filter-branch path isn't a silent trap.)
                              2. Ordering: re-sign while rulesets are permissive, and the blocker is per-branch
                              Step 2 says "temporarily set the ruleset Enforcement to Disabled ... since the admin bypass won't permit the force-push." In practice:
                              • If you re-sign before importing the strict rulesets (i.e. while the repo still has permissive/no rules), you avoid the disable/re-enable dance entirely. Recommend stating the order: re-sign + force-push first, import strict rulesets after.
                              • The push rejection is per-branch and depends on which rule each ruleset has. On a partially-configured repo I hit: develop (deletion-only ruleset) accepted the force-push, but main (had a pull_request rule) rejected it with GH013 ... Changes must be made through a pull request - which doesn't read like a force-push error. Worth noting that either Require a pull requestorBlock force pushes will reject the direct push, and admin bypass covers neither for git force-push, so the ruleset must be disabled/removed on each affected branch.
                              3. Tags are orphaned by a root rewrite
                              A full-history re-sign leaves existing tags (82 release tags here) pointing at the pre-rewrite commits. The Require signed commits rule applies to branches, not tags, so leaving them is fine (the old commits stay reachable via the tags); add --tag-name-filter cat only if you want tags to follow the rewrite. The procedure should call this out so 80+ "dangling" tags don't surprise the maintainer.
                              4. Verify via the API, not local %G?
                              Locally git log --pretty=%G? showed G only because allowed_signers happened to be configured; on a fresh machine it can show U (good, untrusted) even though the signature is fine. The authoritative post-push check is:
                              gh api repos/<owner>/<repo>/commits/<branch> --jq '.commit.verification'# expect verified: true, reason: valid
                              5. Post-rewrite cleanup
                              Open bot PRs/branches based on the old history go stale after the force-push; note to let Dependabot recreate them (or rebase) so reviewers aren't confused.
                              6. Minor
                              git filter-branch printed envsubst: not found (git-sh-setup i18n) on a WSL runner - harmless, but startling; a one-line "this warning is benign" note would help.
                              Surfaced while completing the brownfield migration for ptr727/ESPHome-NonRoot (see ptr727/ESPHome-NonRoot#61).
                              Metadata
                              Metadata
                              Assignees
                              No one assigned
                                Labels
                                documentationImprovements or additions to documentation
                                Projects
                                No projects
                                  Milestone
                                  No milestone
                                  Relationships
                                  None yet
                                  Development
                                  No branches or pull requests
                                  Issue actions