fixes

Author: vmoens

src/ghstack/land.py

@@ -168,8 +168,7 @@ def main(
                 lines[0] = subject
                 new_msg = "\n".join(lines)
                 # Preserve dates to keep the commit hash consistent
-                sh.sh(
-                    "git",
+                sh.git(
                     "commit",
                     "--amend",
                     "-F",

test/land/default_branch_change.py.test

@@ -107,8 +107,8 @@ gh_land(diff2.pr_url)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-838086c Commit B (#501)
-da05922 Commit A (#500)
+6b7e56e Commit B (#501)
+1132c50 Commit A (#500)
 dc8bfe4 Initial commit""",
 )
 assert_expected_inline(

test/land/ff.py.test

@@ -11,7 +11,7 @@ gh_land(pr_url)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-8b039fb Commit A (#500)
+d518c9f Commit A (#500)
 dc8bfe4 Initial commit""",
 )
 

test/land/ff_stack.py.test

@@ -16,7 +16,7 @@ gh_land(pr_url)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-34cfe12 Commit B (#501)
-049a42c Commit A (#500)
+4099517 Commit B (#501)
+c28edd5 Commit A (#500)
 dc8bfe4 Initial commit""",
 )

test/land/ff_stack_two_phase.py.test

@@ -18,7 +18,7 @@ gh_land(pr_url2)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-34cfe12 Commit B (#501)
-049a42c Commit A (#500)
+4099517 Commit B (#501)
+c28edd5 Commit A (#500)
 dc8bfe4 Initial commit""",
 )

test/land/invalid_resubmit.py.test

@@ -44,15 +44,15 @@ else:
 
             This is commit A
 
-            * d700a19 New PR
+            * d1c3c7e New PR
 
         Repository state:
 
-            * d700a19 (gh/ezyang/1/head)
+            * d1c3c7e (gh/ezyang/1/head)
             |    New PR
-            * 239fc10 (gh/ezyang/1/base)
+            * 5f392f5 (gh/ezyang/1/base)
             |    New PR (base update)
-            * 8b039fb (HEAD -> master)
+            * d518c9f (HEAD -> master)
             |    Commit A (#500)
             * dc8bfe4
                  Initial commit

test/land/non_ff.py.test

@@ -17,7 +17,7 @@ gh_land(pr_url)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-0388cc8 Commit A (#500)
+8b61aeb Commit A (#500)
 38808c0 Commit U
 dc8bfe4 Initial commit""",
 )

test/land/non_ff_stack_two_phase.py.test

@@ -22,8 +22,8 @@ gh_land(pr_url2)
 assert_expected_inline(
     get_upstream_sh().git("log", "--oneline", "master"),
     """\
-3657657 Commit B (#501)
-18a5a80 Commit A (#500)
+402e96c Commit B (#501)
+e388a10 Commit A (#500)
 a8ca27f Commit C
 dc8bfe4 Initial commit""",
 )

test/land/update_after_land.py.test

@@ -55,16 +55,16 @@ else:
 
             This is commit B
 
-            * 0b71837 Run 3
+            * 87c9ccd Run 3
             * 16e1e12 Initial 1
 
         Repository state:
 
-            *   0b71837 (gh/ezyang/2/head)
+            *   87c9ccd (gh/ezyang/2/head)
             |\\     Run 3
-            | *   16c66a5 (gh/ezyang/2/base)
+            | *   a800ca6 (gh/ezyang/2/base)
             | |\\     Run 3 (base update)
-            | | * 71f0c87 (HEAD -> master)
+            | | * 70eb094 (HEAD -> master)
             | | |    Commit A (#500)
             | | * 7f0288c
             | | |    Commit U