Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  git-for-each-ref.txt: minor improvements
  name-rev: Fix segmentation fault when using --all
  • Loading branch information
Junio C Hamano committed Jun 6, 2008
2 parents 7f718e8 + c0f6dc9 commit e919cb3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
17 changes: 9 additions & 8 deletions Documentation/git-for-each-ref.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ git-for-each-ref - Output information on each ref
SYNOPSIS
--------
[verse]
'git-for-each-ref' [--count=<count>]\*
[--shell|--perl|--python|--tcl]
[--sort=<key>]\* [--format=<format>] [<pattern>]
'git-for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
[--sort=<key>]\* [--format=<format>] [<pattern>...]

DESCRIPTION
-----------
Expand All @@ -32,8 +31,9 @@ OPTIONS
<key>::
A field name to sort on. Prefix `-` to sort in
descending order of the value. When unspecified,
`refname` is used. More than one sort keys can be
given.
`refname` is used. You may use the --sort=<key> option
multiple times, in which case the last key becomes the primary
key.

<format>::
A string that interpolates `%(fieldname)` from the
Expand All @@ -48,9 +48,10 @@ OPTIONS
`%09` to `\t` (TAB) and `%0a` to `\n` (LF).

<pattern>::
If given, the name of the ref is matched against this
using fnmatch(3). Refs that do not match the pattern
are not shown.
If one or more patterns are given, only refs are shown that
match againt at least one pattern, either using fnmatch(3) or
literally, in the latter case matching completely or from the
beginning up to a slash.

--shell, --perl, --python, --tcl::
If given, strings that substitute `%(fieldname)`
Expand Down
8 changes: 6 additions & 2 deletions builtin-name-rev.c
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,13 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
int i, max;

max = get_max_object_index();
for (i = 0; i < max; i++)
show_name(get_indexed_object(i), NULL,
for (i = 0; i < max; i++) {
struct object *obj = get_indexed_object(i);
if (!obj)
continue;
show_name(obj, NULL,
always, allow_undefined, data.name_only);
}
} else {
int i;
for (i = 0; i < revs.nr; i++)
Expand Down

0 comments on commit e919cb3

Please sign in to comment.