@@ -1,3 +1,5 @@ + - FIX: properly recognize the new output of "git branch -d" in git 1.6.1 + Release 1.7.0 [2008-12-01] - Added Git config language (thanks, Allan Odgaard) CHANGELOG @@ -112,7 +112,7 @@ class SCM::Git::Branch < SCM::Git::CommandProxyBase output = base.command("branch", options[:force] ? "-D" : "-d", name).strip outcome = case output - when "Deleted branch #{name}." + when /^Deleted branch #{name}/ :success when /error.+(not a strict subset|not an ancestor of your current HEAD)/ :unmerged Support/lib/commands/branch.rb 48a7ef38a80647a89ec620badc0ca7eeabf62874 Tim Harper timcharper@gmail.com http://github.com/lsegal/git-tmbundle/commit/9707d5d97a8bfef8323c70a5d88fda269677d778 9707d5d97a8bfef8323c70a5d88fda269677d778 2009-01-21T13:59:18-08:00 2009-01-21T13:59:00-08:00 FIX: properly recognize the new output of "git branch -d" in git 1.6.1 2d498f1a12be2809a93d3f45c7789801dca6d23a Tim Harper timcharper@gmail.com