Fifth batch for 2.5 cycle

Junio C Hamano committed over 11 years ago

Merge branch 'nd/untracked-cache'

Junio C Hamano committed over 11 years ago

Merge branch 'rs/plug-leak-in-pack-bitmaps'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-ff-vs-merge-ff'

Junio C Hamano committed over 11 years ago

Merge branch 'pt/pull-log-n'

Junio C Hamano committed over 11 years ago

Merge branch 'jk/rerere-forget-check-enabled'

Junio C Hamano committed over 11 years ago

git-p4: tests: use test-chmtime in place of touch

Luke Diamand committed over 11 years ago

t4015: separate common setup and per-test expectation

Junio C Hamano committed over 11 years ago

t4015: modernise style

Junio C Hamano committed over 11 years ago

Merge branch 'jk/http-backend-deadlock-2.3' into jk/http-backend-deadlock

Junio C Hamano committed over 11 years ago

Merge branch 'jk/http-backend-deadlock-2.2' into jk/http-backend-deadlock-2.3

Junio C Hamano committed over 11 years ago

http-backend: spool ref negotiation requests to buffer

Jeff King committed over 11 years ago

struct ref_lock: convert old_sha1 member to object_id

Michael Haggerty committed over 11 years ago

warn_if_dangling_symref(): convert local variable "junk" to object_id

Michael Haggerty committed over 11 years ago

each_ref_fn_adapter(): remove adapter

Michael Haggerty committed over 11 years ago

rev_list_insert_ref(): remove unneeded arguments

Michael Haggerty committed over 11 years ago

rev_list_insert_ref_oid(): new function, taking an object_oid

Michael Haggerty committed over 11 years ago

mark_complete(): remove unneeded arguments

Michael Haggerty committed over 11 years ago

mark_complete_oid(): new function, taking an object_oid

Michael Haggerty committed over 11 years ago

clear_marks(): rewrite to take an object_id argument

Michael Haggerty committed over 11 years ago