Merge branch 'bc/vcs-svn-cleanup'

Junio C Hamano committed about 9 years ago

Merge branch 'tb/apply-with-crlf'

Junio C Hamano committed about 9 years ago

Merge branch 'jt/stash-tests'

Junio C Hamano committed about 9 years ago

Merge branch 'jk/trailers-parse'

Junio C Hamano committed about 9 years ago

Merge branch 'pb/trailers-from-command-line'

Junio C Hamano committed about 9 years ago

Merge branch 'jt/diff-color-move-fix'

Junio C Hamano committed about 9 years ago

Merge branch 'sb/diff-color-move'

Junio C Hamano committed about 9 years ago

load_subtree(): declare some variables to be `size_t`

Michael Haggerty committed about 9 years ago

hex_to_bytes(): simpler replacement for `get_oid_hex_segment()`

Michael Haggerty committed about 9 years ago

get_oid_hex_segment(): don't pad the rest of `oid`

Michael Haggerty committed about 9 years ago

load_subtree(): combine some common code

Michael Haggerty committed about 9 years ago

get_oid_hex_segment(): return 0 on success

Michael Haggerty committed about 9 years ago

load_subtree(): only consider blobs to be potential notes

Michael Haggerty committed about 9 years ago

load_subtree(): check earlier whether an internal node is a tree entry

Michael Haggerty committed about 9 years ago

load_subtree(): separate logic for internal vs. terminal entries

Michael Haggerty committed about 9 years ago

load_subtree(): fix incorrect comment

Michael Haggerty committed about 9 years ago

load_subtree(): reduce the scope of some local variables

Michael Haggerty committed about 9 years ago

load_subtree(): remove unnecessary conditional

Michael Haggerty committed about 9 years ago

notes: make GET_NIBBLE macro more robust

Michael Haggerty committed about 9 years ago

apply: remove epoch date from regex

René Scharfe committed about 9 years ago