git/commit.c, branch v2.0.0

Merge branch 'nd/log-show-linear-break'

2014-04-03T19:38:11Z

Attempts to show where a single-strand-of-pearls break in "git log" output. * nd/log-show-linear-break: log: add --show-linear-break to help see non-linear history object.h: centralize object flag allocation

object.h: centralize object flag allocation

2014-03-25T22:09:24Z

While the field "flags" is mainly used by the revision walker, it is also used in many other places. Centralize the whole flag allocation to one place for a better overview (and easier to move flags if we have too). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'dd/use-alloc-grow'

2014-03-18T20:50:21Z

Replace open-coded reallocation with ALLOC_GROW() macro. * dd/use-alloc-grow: sha1_file.c: use ALLOC_GROW() in pretend_sha1_file() read-cache.c: use ALLOC_GROW() in add_index_entry() builtin/mktree.c: use ALLOC_GROW() in append_to_tree() attr.c: use ALLOC_GROW() in handle_attr_line() dir.c: use ALLOC_GROW() in create_simplify() reflog-walk.c: use ALLOC_GROW() replace_object.c: use ALLOC_GROW() in register_replace_object() patch-ids.c: use ALLOC_GROW() in add_commit() diffcore-rename.c: use ALLOC_GROW() diff.c: use ALLOC_GROW() commit.c: use ALLOC_GROW() in register_commit_graft() cache-tree.c: use ALLOC_GROW() in find_subtree() bundle.c: use ALLOC_GROW() in add_to_ref_list() builtin/pack-objects.c: use ALLOC_GROW() in check_pbase_path()

Merge branch 'dd/find-graft-with-sha1-pos'

2014-03-18T20:50:11Z

Replace a hand-rolled binary search with a call to our generic binary search helper function. * dd/find-graft-with-sha1-pos: commit.c: use the generic "sha1_pos" function for lookup

commit.c: use skip_prefix() instead of starts_with()

2014-03-04T21:26:42Z

In record_author_date() & parse_gpg_output(), the callers of starts_with() not just want to know if the string starts with the prefix, but also can benefit from knowing the string that follows the prefix. By using skip_prefix(), we can do both at the same time. Helped-by: Max Horn Helped-by: Junio C Hamano Helped-by: Michael Haggerty Signed-off-by: Tanay Abhra Signed-off-by: Junio C Hamano

commit.c: use ALLOC_GROW() in register_commit_graft()

2014-03-03T22:47:07Z

Signed-off-by: Dmitry S. Dolzhenko Signed-off-by: Junio C Hamano

commit.c: use the generic "sha1_pos" function for lookup

2014-02-27T18:55:27Z

Refactor binary search in "commit_graft_pos" function: use generic "sha1_pos" function. Signed-off-by: Dmitry S. Dolzhenko Signed-off-by: Junio C Hamano

Merge branch 'vm/octopus-merge-bases-simplify'

2014-01-10T18:33:45Z

* vm/octopus-merge-bases-simplify: get_octopus_merge_bases(): cleanup redundant variable

Merge branch 'js/lift-parent-count-limit'

2014-01-10T18:33:36Z

There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism. * js/lift-parent-count-limit: Remove the line length limit for graft files

Merge branch 'nd/commit-tree-constness'

2014-01-10T18:33:13Z

Code clean-up. * nd/commit-tree-constness: commit.c: make "tree" a const pointer in commit_tree*()