ref: ca837be27a257b8dff9df887fe751f46136c17d3
parent: f188c2ab1d6a7f8661647f0f323710a4188f4452
author: Ori Bernstein <[email protected]>
date: Thu Apr 29 23:28:52 EDT 2021
git/branch: don't clobber variable in merge1 argument When doing a merge on branch switch, we would use 'base' as the base commmit and later override it with the merge ancestor of the commit, fucking up the paths. Rename the variable so we don't clobber it.
--- a/branch
+++ b/branch
@@ -95,9 +95,9 @@
}
for(ours in $dirtypaths){- base=/mnt/git/object/$orig/tree/$ours
+ common=/mnt/git/object/$orig/tree/$ours
theirs=/mnt/git/object/$base/tree/$ours
- merge1 $ours $ours $base $theirs
+ merge1 $ours $ours $common $theirs
}
if(! ~ $#deleted 0){