echo "Skip empty patch $_dep";
else
if "$numbered"; then
- number="$(printf "%04u" $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
- bn="$number-$bn";
+ number="$(echo $(($(cat "$playground/^number" 2>/dev/null) + 1)))";
+ bn="$(printf "%04u-$bn" $number)";
echo "$number" >"$playground/^number";
fi;
git merge-recursive "$(pretty_tree "refs/top-bases/$_dep")" -- HEAD "$(pretty_tree "refs/heads/$_dep")" || retmerge="$?";
if test "x$retmerge" != "x0"; then
+ git rerere;
echo "fix up the merge and update the index. Don't commit!"
#todo error handling
sh -i </dev/tty;