Merge branch 'jk/reading-packed-refs'

Junio C Hamano committed over 11 years ago

Merge branch 'lm/squelch-bg-progress'

Junio C Hamano committed over 11 years ago

Merge branch 'jk/sha1-file-reduce-useless-warnings'

Junio C Hamano committed over 11 years ago

Merge branch 'nd/multiple-work-trees'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/credential-xdg'

Junio C Hamano committed over 11 years ago

reflog_expire(): integrate lock_ref_sha1_basic() errors into ours

Michael Haggerty committed over 11 years ago

ref_transaction_commit(): delete extra "the" from error message

Michael Haggerty committed over 11 years ago

ref_transaction_commit(): provide better error messages

Michael Haggerty committed over 11 years ago

rename_ref(): integrate lock_ref_sha1_basic() errors into ours

Michael Haggerty committed over 11 years ago

lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts

Michael Haggerty committed over 11 years ago

lock_ref_sha1_basic(): report errors via a "struct strbuf *err"

Michael Haggerty committed over 11 years ago

verify_refname_available(): report errors via a "struct strbuf *err"

Michael Haggerty committed over 11 years ago

verify_refname_available(): rename function

Michael Haggerty committed over 11 years ago

refs: check for D/F conflicts among refs created in a transaction

Michael Haggerty committed over 11 years ago

ref_transaction_commit(): use a string_list for detecting duplicates

Michael Haggerty committed over 11 years ago

is_refname_available(): use dirname in first loop

Michael Haggerty committed over 11 years ago

struct nonmatching_ref_data: store a refname instead of a ref_entry

Michael Haggerty committed over 11 years ago

report_refname_conflict(): inline function

Michael Haggerty committed over 11 years ago

entry_matches(): inline function

Michael Haggerty committed over 11 years ago

is_refname_available(): convert local variable "dirname" to strbuf

Michael Haggerty committed over 11 years ago