diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:05:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-23 16:05:46 -0700 |
| commit | e13067a7499f3cbf543d4a30865c70613f055b4b (patch) | |
| tree | b7bd4d007656599959fed85db64ff5cd2cef37a9 | |
| parent | dd0ffd5b31a672db90d8b775988d55829e6f5f9f (diff) | |
| parent | 77599cc0bbd0a08defc3bfa80ca52d931d8dc786 (diff) | |
| download | git-e13067a7499f3cbf543d4a30865c70613f055b4b.tar.gz git-e13067a7499f3cbf543d4a30865c70613f055b4b.tar.xz | |
Merge branch 'maint'
* maint:
rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
Add missing "short" alternative to --date in rev-list-options.txt
git-show.txt: Not very stubby these days.
Clarify repack -n documentation
| -rw-r--r-- | Documentation/git-repack.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-show.txt | 2 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 2 | ||||
| -rw-r--r-- | builtin-rev-parse.c | 18 |
4 files changed, 18 insertions, 11 deletions
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt index 3d957492f..d14ab5154 100644 --- a/Documentation/git-repack.txt +++ b/Documentation/git-repack.txt @@ -55,8 +55,11 @@ OPTIONS linkgit:git-pack-objects[1]. -n:: - Do not update the server information with - `git update-server-info`. + Do not update the server information with + `git update-server-info`. This option skips + updating local catalog files needed to publish + this repository (or a direct copy of it) + over HTTP or FTP. See gitlink:git-update-server-info[1]. --window=[N], --depth=[N]:: These two options affect how the objects contained in the pack are diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index dccf0e20e..29ed0acc6 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -79,8 +79,6 @@ Documentation ------------- Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>. -This manual page is a stub. You can help the git documentation by expanding it. - GIT --- Part of the linkgit:git[7] suite diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 3558348b7..dfcef79a6 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -13,7 +13,7 @@ include::pretty-options.txt[] Synonym for `--date=relative`. ---date={relative,local,default,iso,rfc}:: +--date={relative,local,default,iso,rfc,short}:: Only takes effect for dates shown in human-readable format, such as when using "--pretty". `log.date` config variable sets a default diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c index f8d8548e9..ab3e85054 100644 --- a/builtin-rev-parse.c +++ b/builtin-rev-parse.c @@ -94,6 +94,14 @@ static void show(const char *arg) puts(arg); } +/* Like show(), but with a negation prefix according to type */ +static void show_with_type(int type, const char *arg) +{ + if (type != show_type) + putchar('^'); + show(arg); +} + /* Output a revision, only if filter allows it */ static void show_rev(int type, const unsigned char *sha1, const char *name) { @@ -101,8 +109,6 @@ static void show_rev(int type, const unsigned char *sha1, const char *name) return; def = NULL; - if (type != show_type) - putchar('^'); if (symbolic && name) { if (symbolic == SHOW_SYMBOLIC_FULL) { unsigned char discard[20]; @@ -119,20 +125,20 @@ static void show_rev(int type, const unsigned char *sha1, const char *name) */ break; case 1: /* happy */ - show(full); + show_with_type(type, full); break; default: /* ambiguous */ error("refname '%s' is ambiguous", name); break; } } else { - show(name); + show_with_type(type, name); } } else if (abbrev) - show(find_unique_abbrev(sha1, abbrev)); + show_with_type(type, find_unique_abbrev(sha1, abbrev)); else - show(sha1_to_hex(sha1)); + show_with_type(type, sha1_to_hex(sha1)); } /* Output a flag, only if filter allows it. */ |