Merge branch 'maint'

* maint:
  git-for-each-ref.txt: minor improvements
  name-rev: Fix segmentation fault when using --all
This commit is contained in:
Junio C Hamano 2008-06-06 09:21:48 -07:00
commit e919cb302e
2 changed files with 15 additions and 10 deletions

View File

@ -8,9 +8,8 @@ git-for-each-ref - Output information on each ref
SYNOPSIS SYNOPSIS
-------- --------
[verse] [verse]
'git-for-each-ref' [--count=<count>]\* 'git-for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
[--shell|--perl|--python|--tcl] [--sort=<key>]\* [--format=<format>] [<pattern>...]
[--sort=<key>]\* [--format=<format>] [<pattern>]
DESCRIPTION DESCRIPTION
----------- -----------
@ -32,8 +31,9 @@ OPTIONS
<key>:: <key>::
A field name to sort on. Prefix `-` to sort in A field name to sort on. Prefix `-` to sort in
descending order of the value. When unspecified, descending order of the value. When unspecified,
`refname` is used. More than one sort keys can be `refname` is used. You may use the --sort=<key> option
given. multiple times, in which case the last key becomes the primary
key.
<format>:: <format>::
A string that interpolates `%(fieldname)` from the A string that interpolates `%(fieldname)` from the
@ -48,9 +48,10 @@ OPTIONS
`%09` to `\t` (TAB) and `%0a` to `\n` (LF). `%09` to `\t` (TAB) and `%0a` to `\n` (LF).
<pattern>:: <pattern>::
If given, the name of the ref is matched against this If one or more patterns are given, only refs are shown that
using fnmatch(3). Refs that do not match the pattern match againt at least one pattern, either using fnmatch(3) or
are not shown. literally, in the latter case matching completely or from the
beginning up to a slash.
--shell, --perl, --python, --tcl:: --shell, --perl, --python, --tcl::
If given, strings that substitute `%(fieldname)` If given, strings that substitute `%(fieldname)`

View File

@ -280,9 +280,13 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
int i, max; int i, max;
max = get_max_object_index(); max = get_max_object_index();
for (i = 0; i < max; i++) for (i = 0; i < max; i++) {
show_name(get_indexed_object(i), NULL, struct object *obj = get_indexed_object(i);
if (!obj)
continue;
show_name(obj, NULL,
always, allow_undefined, data.name_only); always, allow_undefined, data.name_only);
}
} else { } else {
int i; int i;
for (i = 0; i < revs.nr; i++) for (i = 0; i < revs.nr; i++)