Browse Source

Make tests pass with recent git (1.7.0 and up).

It seems that in older versions, --message="" was interpreted as "use the
default commit message" instead of "use an empty commit message", and
git-subtree was depending on this behaviour.  Now we don't, so tests pass
again.
maint
Avery Pennarun 15 years ago
parent
commit
349a70d5cf
  1. 6
      git-subtree.sh

6
git-subtree.sh

@ -603,7 +603,11 @@ cmd_merge() @@ -603,7 +603,11 @@ cmd_merge()
rev="$new"
fi
git merge -s subtree --message="$message" $rev
if [ -n "$message" ]; then
git merge -s subtree --message="$message" $rev
else
git merge -s subtree $rev
fi
}

cmd_pull()

Loading…
Cancel
Save