git/commit.c, branch v1.7.8.2

Merge branch 'rs/pending'

2011-10-14T02:03:22Z

* rs/pending: commit: factor out clear_commit_marks_for_object_array checkout: use leak_pending flag bundle: use leak_pending flag bisect: use leak_pending flag revision: add leak_pending flag checkout: use add_pending_{object,sha1} in orphan check revision: factor out add_pending_sha1 checkout: check for "Previous HEAD" notice in t2020 Conflicts: builtin/checkout.c revision.c

Merge branch 'nd/maint-autofix-tag-in-head'

2011-10-14T02:03:19Z

* nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c

commit: factor out clear_commit_marks_for_object_array

2011-10-03T18:15:34Z

Factor out the code to clear the commit marks for a whole struct object_array from builtin/checkout.c into its own exported function clear_commit_marks_for_object_array and use it in bisect and bundle as well. It handles tags and commits and ignores objects of any other type. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Accept tags in HEAD or MERGE_HEAD

2011-09-18T21:11:40Z

HEAD and MERGE_HEAD (among other branch tips) should never hold a tag. That can only be caused by broken tools and is cumbersome to fix by an end user with: $ git update-ref HEAD $(git rev-parse HEAD^{commit}) which may look like a magic to a new person. Be easy, warn users (so broken tools can be fixed if they bother to report) and move on. Be robust, if the given SHA-1 cannot be resolved to a commit object, die (therefore return value is always valid). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'nd/decorate-grafts'

2011-08-29T04:22:58Z

* nd/decorate-grafts: log: Do not decorate replacements with --no-replace-objects log: decorate "replaced" on to replaced commits log: decorate grafted commits with "grafted" Move write_shallow_commits to fetch-pack.c Add for_each_commit_graft() to iterate all grafts decoration: do not mis-decorate refs with same prefix

whitespace: have SP on both sides of an assignment "="

2011-08-25T21:47:07Z

I've deliberately excluded the borrowed code in compat/nedmalloc directory. Signed-off-by: Junio C Hamano

Move write_shallow_commits to fetch-pack.c

2011-08-18T18:01:18Z

This function produces network traffic and should be in fetch-pack. It has been in commit.c because it needs to iterate (private) graft list. It can now do so using for_each_commit_graft(). Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Add for_each_commit_graft() to iterate all grafts

2011-08-18T18:00:14Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Add const to parse_{commit,tag}_buffer()

2011-02-07T23:04:42Z

Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'tf/commit-list-prefix'

2010-12-22T22:40:17Z

* tf/commit-list-prefix: commit: Add commit_list prefix in two function names. Conflicts: sha1_name.c