Code

Merge branch 'nd/resolve-ref'
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:14 +0000 (13:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Dec 2011 21:37:14 +0000 (13:37 -0800)
commitb7f7c07977ab6e41899b835b873a1ac499eaa2b3
tree9b20151eb2b1a325ed2c72c22fad41616d8d98db
parenteb8aa3d2c2849cb3a44396b89054339df38e2bfa
parentd5a35c114ab6b4337a1c7598bf75c331d94ee092
Merge branch 'nd/resolve-ref'

* nd/resolve-ref:
  Copy resolve_ref() return value for longer use
  Convert many resolve_ref() calls to read_ref*() and ref_exists()

Conflicts:
builtin/fmt-merge-msg.c
builtin/merge.c
refs.c
builtin/branch.c
builtin/checkout.c
builtin/commit.c
builtin/fmt-merge-msg.c
builtin/merge.c
builtin/tag.c
cache.h
notes-merge.c
refs.c