summaryrefslogtreecommitdiff
path: root/builtin-rev-parse.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-23 16:05:46 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-23 16:05:46 -0700
commite13067a7499f3cbf543d4a30865c70613f055b4b (patch)
treeb7bd4d007656599959fed85db64ff5cd2cef37a9 /builtin-rev-parse.c
parentdd0ffd5b31a672db90d8b775988d55829e6f5f9f (diff)
parent77599cc0bbd0a08defc3bfa80ca52d931d8dc786 (diff)
downloadgit-e13067a7499f3cbf543d4a30865c70613f055b4b.tar.gz
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
Diffstat (limited to 'builtin-rev-parse.c')
-rw-r--r--builtin-rev-parse.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index f8d8548e9c..ab3e85054e 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. */