user/sven/git.git/commit.c, branch v1.7.7.4

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

2011-10-21T17:49:26Z

* 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

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

Merge branch 'pn/commit-autosquash'

2010-12-04T00:13:06Z

* pn/commit-autosquash: add tests of commit --squash commit: --squash option for use with rebase --autosquash add tests of commit --fixup commit: --fixup option for use with rebase --autosquash pretty.c: teach format_commit_message() to reencode the output commit: helper methods to reduce redundant blocks of code Conflicts: Documentation/git-commit.txt t/t3415-rebase-autosquash.sh

commit.c: Remove backward goto in read_craft_line()

2010-12-01T21:16:39Z

Bad graft data is noticed in several places in read_graft_line(), and in each case we go back to the first site of detection. It in general is a better style to have an exception handling out of line from the main codepath and make error codepath jump forward. Signed-off-by: Ralf Thielow Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano