delta/git.git, branch ml/mailmap

mailmap: xcalloc mailmap_info

2011-11-17T02:00:56+00:00

This is to avoid reaching free of uninitialized members.

With an invalid .mailmap (and perhaps in other cases), it can reach
free(mi->name) with garbage for example.

Signed-off-by: Marc-André Lureau 
Signed-off-by: Junio C Hamano

Add map_user() and clear_mailmap() to mailmap

2009-02-08T20:36:38+00:00

map_user() allows to lookup and replace both email and
name of a user, based on a new style mailmap file.

The possible mailmap definitions are now:

  proper_name                              # Old style
                             # New style
  proper_name                # New style
  proper_name  commit_name   # New style

map_email() operates the same as before, with the
exception that it also will to try to match on a name
passed in through the name return buffer.

clear_mailmap() is needed to now clear the more complex
mailmap structure.

Signed-off-by: Marius Storm-Olsen 
Signed-off-by: Junio C Hamano

Add find_insert_index, insert_at_index and clear_func functions to string_list

2009-02-08T20:36:31+00:00

string_list_find_insert_index() and string_list_insert_at_index()
enables you to see if an item is in the string_list, and to
insert at the appropriate index in the list, if not there.
This is usefull if you need to manipulate an existing item,
if present, and insert a new item if not.

Future mailmap code will use this construct to enable
complex (old_name, old_email) -> (new_name, new_email)
lookups.

The string_list_clear_func() allows to call a custom
cleanup function on each item in a string_list, which is
useful is the util member points to a complex structure.

Signed-off-by: Marius Storm-Olsen 
Signed-off-by: Junio C Hamano

Add mailmap.file as configurational option for mailmap location

2009-02-08T20:36:26+00:00

This allows us to augment the repo mailmap file, and to use
mailmap files elsewhere than the repository root. Meaning
that the entries in mailmap.file will override the entries
in "./.mailmap", should they match.

Signed-off-by: Marius Storm-Olsen 
Signed-off-by: Junio C Hamano

Merge branch 'jc/fsck' (early part)

2009-02-05T00:40:15+00:00

* 'jc/fsck' (early part):
  fsck: check loose objects from alternate object stores by default
  fsck: HEAD is part of refs

git-bundle doc: update examples

2009-02-04T23:16:35+00:00

This rewrites the example part of the bundle doucmentation to follow
the suggestion made by Junio during a recent discussion (gmane 108030).

Instead of just showing different ways to create and use bundles in a
disconnected fashion, the rewritten example first shows the simplest
"full cycle" of sneakernet workflow, and then introduces various
variations.

The words are mostly taken from Junio's outline. I only reformatted
them and proofread to make sure the end result flows naturally.

Signed-off-by: Nanako Shiraishi 
Signed-off-by: Junio C Hamano

Replace deprecated dashed git commands in usage

2009-02-04T23:08:49+00:00

Signed-off-by: Alexander Potashev 
Signed-off-by: Junio C Hamano

git-show-branch doc: show -g as synonym to --reflog in the list

2009-02-04T23:08:08+00:00

Signed-off-by: jidanni 
Signed-off-by: Junio C Hamano

contrib git-resurrect: find traces of a branch name and resurrect it

2009-02-04T23:07:49+00:00

Add a tool 'git-resurrect.sh ' that tries to find traces of
the  in the HEAD reflog and, optionally, all merge commits in
the repository.  It can then resurrect the branch, pointing it at the
most recent of all candidate commits found.

Signed-off-by: Thomas Rast 
Signed-off-by: Junio C Hamano

Merge branch 'maint'

2009-02-04T21:07:09+00:00

* maint:
  urls.txt: document optional port specification in git URLS
  builtin-mv.c: check for unversionned files before looking at the destination.
  Add a testcase for "git mv -f" on untracked files.
  Missing && in t/t7001.sh.