merge_msg() is really more like rejoin_msg().
Avery Pennarun committed
May 30, 2009 at 01:28 UTC
7ee9eef340170da6d13b9a0ab5a8d23950523b0d
1 file changed
+8
-5
git-subtree.sh
+8
-5
@@ -178,15 +178,15 @@ find_existing_splits()
178
case "$a" in
179
git-subtree-mainline:) main="$b" ;;
180
git-subtree-split:) sub="$b" ;;
181
- *)
181
+ END)
182
if [ -n "$main" -a -n "$sub" ]; then
183
debug " Prior: $main -> $sub"
184
cache_set $main $sub
185
try_remove_previous "$main"
186
try_remove_previous "$sub"
187
- main=
188
- sub=
187
fi
188
+ main=
189
+ sub=
190
;;
191
esac
192
done
@@ -230,7 +230,7 @@ add_msg()
230
EOF
231
}
232
233
-merge_msg()
233
+rejoin_msg()
234
{
235
dir="$1"
236
latest_old="$2"
@@ -410,6 +410,9 @@ cmd_split()
410
411
tree=$(subtree_for_commit $rev "$dir")
412
debug " tree is: $tree"
413
+
414
+ # ugly. is there no better way to tell if this is a subtree
415
+ # vs. a mainline commit? Does it matter?
416
[ -z $tree ] && continue
417
418
newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
@@ -427,7 +430,7 @@ cmd_split()
430
debug "Merging split branch into HEAD..."
431
latest_old=$(cache_get latest_old)
432
git merge -s ours \
430
- -m "$(merge_msg $dir $latest_old $latest_new)" \
433
+ -m "$(rejoin_msg $dir $latest_old $latest_new)" \
434
$latest_new >&2 || exit $?
435
fi
436
if [ -n "$branch" ]; then