]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Meta/Reintegrate: allow preparing an update on a detached HEAD
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Jul 2026 18:59:33 +0000 (11:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Jul 2026 18:59:33 +0000 (11:59 -0700)
While waiting for build and test of the current round of
integration, we should be able to prepare the next round while on
a detached HEAD.  By running

    $ git co --detach master
    $ INTO=jch Meta/redo-jch.sh

we can prepare a sequence of "Merge branch 'foo' into jch" commits
that can be used to replace 'jch' that is currently being tested,
without disrupting the test.

Reintegrate

index da2f0ed5c85d0d8ae0ba17b2d92697cef41b8d89..dd474a9f938077c3acb8492c9c64b494e8647372 100755 (executable)
@@ -173,7 +173,7 @@ no)
                        into="--into $original_branch"
                else
                        original_branch=
-                       into=
+                       into=${INTO:+"--into $INTO"}
                fi
        }