feat: create a separate move commit

hraban · Jun 4, 2024 · 5478066 · 5478066
1 parent 4d45b3a
commit 5478066
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Readme.org b/Readme.org
@@ -404,10 +404,14 @@ This is the money shot.
 
 git read-tree --prefix "$repopath" "refs/remotes/$reponame/$branch"
 tree="$(git write-tree)"
+move="$(git commit-tree \
+    "$tree" \
+    -p "refs/remotes/$reponame/$branch" \
+    -m "Move all files to $repopath/")"
 commit="$(git commit-tree \
     "$tree" \
     -p "$branch" \
-    -p "refs/remotes/$reponame/$branch" \
+    -p "$move" \
     -m "Merge $reponame/$branch")"
 git reset -q "$commit"
 #+END_SRC

diff --git a/tomono b/tomono
@@ -75,10 +75,14 @@ while IFS=$'\r'"$IFS" read -r repourl reponame repopath; do
 
         git read-tree --prefix "$repopath" "refs/remotes/$reponame/$branch"
         tree="$(git write-tree)"
+        move="$(git commit-tree \
+            "$tree" \
+            -p "refs/remotes/$reponame/$branch" \
+            -m "Move all files to $repopath/")"
         commit="$(git commit-tree \
             "$tree" \
             -p "$branch" \
-            -p "refs/remotes/$reponame/$branch" \
+            -p "$move" \
             -m "Merge $reponame/$branch")"
         git reset -q "$commit"
     done