Merge branch 'rs/ref-transaction-rename' into jch
commit837567812f1a9517b4b2c3ddb92cca84734b9fd6
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:56 +0000 (25 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:56 +0000 (25 12:33 -0700)
treead44b5a13b65403ef85e618edda8794cdc13e04d
parent79e3ec04ffa7611bbc1e184cb05b803a2fa85876
parent909c0d66dfca6fd4a56c7fdb53ccd04696ab61ed
Merge branch 'rs/ref-transaction-rename' into jch

Follow-up on rs/ref-transaction series to make renaming a ref
transactional (i.e. "delete old and create new" should not leave
an in-between state behind when it fails).

No more nitpicks and better design suggestions?

* rs/ref-transaction-rename:
  refs.c: rollback the lockfile before we die() in repack_without_refs
  refs.c: update rename_ref to use a transaction
  refs.c: use packed refs when deleting refs during a transaction
  refs.c: return error instead of dying when locking fails during transaction
  refs.c: allow passing raw git_committer_info as email to _update_reflog

# Conflicts:
#  refs.c
builtin/remote.c
refs.c
refs.h