Merge branch 'rs/ref-transaction' into jch
commit0e9b5a3c9888a3dc4480c1e6c20147743a98e664
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:48 +0000 (25 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Aug 2014 19:33:48 +0000 (25 12:33 -0700)
tree1f78092b0d68d8702c20dc889e8546ed1e46f7fc
parentbe05ee83fddb759716e68b3bc33642cb01904b21
parent282edb28abe86374f0ea8242decf2252c167184a
Merge branch 'rs/ref-transaction' into jch

* rs/ref-transaction:
  refs.c: fix handling of badly named refs
  refs.c: make write_ref_sha1 static
  fetch.c: change s_update_ref to use a ref transaction
  refs.c: propagate any errno==ENOTDIR from _commit back to the callers
  refs.c: pass a skip list to name_conflict_fn
  refs.c: call lock_ref_sha1_basic directly from commit
  refs.c: move the check for valid refname to lock_ref_sha1_basic
  refs.c: pass NULL as *flags to read_ref_full
  refs.c: pass the ref log message to _create/delete/update instead of _commit
  refs.c: add an err argument to delete_ref_loose
  wrapper.c: add a new function unlink_or_msg
  wrapper.c: simplify warn_if_unremovable

# Conflicts:
#  builtin/log.c
#  git-compat-util.h
#  refs.c
#  walker.c
27 files changed:
branch.c
builtin/blame.c
builtin/branch.c
builtin/clone.c
builtin/commit.c
builtin/fetch.c
builtin/fmt-merge-msg.c
builtin/for-each-ref.c
builtin/log.c
builtin/receive-pack.c
builtin/remote.c
builtin/replace.c
builtin/show-branch.c
builtin/tag.c
bundle.c
cache.h
fast-import.c
git-compat-util.h
http-backend.c
refs.c
refs.h
remote.c
sequencer.c
transport-helper.c
transport.c
walker.c
wrapper.c