- head="$(git symbolic-ref HEAD)"
- bname="${head#refs/top-bases/}"
- if [ "$bname" != "$head" -a -s "$git_dir/top-deps" -a -s "$git_dir/top-merge" ]; then
- # We are on a base branch now; resume merge!
+ if [ -z "$name" -a -s "$git_dir/top-name" -a -s "$git_dir/top-deps" -a -s "$git_dir/top-merge" ]; then
+ # We are setting up the base branch now; resume merge!
+ name="$(cat "$git_dir/top-name")"