From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 5 Mar 2015 20:45:39 +0000 (-0800)
Subject: Merge branch 'mh/refs-have-new'
X-Git-Tag: v2.4.0-rc0~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd9de868c359a1bbd214e354aefdb0f1eaa898bd;p=thirdparty%2Fgit.git

Merge branch 'mh/refs-have-new'

Simplify the ref transaction API around how "the ref should be
pointing at this object" is specified.

* mh/refs-have-new:
  refs.h: remove duplication in function docstrings
  update_ref(): improve documentation
  ref_transaction_verify(): new function to check a reference's value
  ref_transaction_delete(): check that old_sha1 is not null_sha1
  ref_transaction_create(): check that new_sha1 is valid
  commit: avoid race when creating orphan commits
  commit: add tests of commit races
  ref_transaction_delete(): remove "have_old" parameter
  ref_transaction_update(): remove "have_old" parameter
  struct ref_update: move "have_old" into "flags"
  refs.c: change some "flags" to "unsigned int"
  refs: remove the gap in the REF_* constant values
  refs: move REF_DELETING to refs.c
---

fd9de868c359a1bbd214e354aefdb0f1eaa898bd