Merge branch 'rs/branch-del-symref'
authorJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:15:04 +0000 (04:15 -0400)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 08:15:04 +0000 (04:15 -0400)
commit9c50374497d5a3259907e32455f228cfbda85ddf
tree544254f56258544ec15aaa24c86924a24d97efb9
parenteeb2535f5a517fc0b5e302cab0a70cc82375b836
parent13baa9fe866f63311af5a5ee318beddb16eb5df4
Merge branch 'rs/branch-del-symref'

A symbolic ref refs/heads/SYM was not correctly removed with
"git branch -d SYM"; the command removed the ref pointed by
SYM instead.

* rs/branch-del-symref:
  branch: show targets of deleted symrefs, not sha1s
  branch: skip commit checks when deleting symref branches
  branch: delete symref branch, not its target
  branch: factor out delete_branch_config()
  branch: factor out check_branch_commit()