summaryrefslogtreecommitdiff
path: root/rev-list.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-07 04:32:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-07 09:09:18 (GMT)
commit5c51c98502bc885f6eda5046de00cdb3c976cad6 (patch)
tree353185393fbc5719dfa4a60e2d8e706569043410 /rev-list.c
parent9760662f1a7a06516ca249a73e5c1a6fb6c0e26e (diff)
downloadgit-5c51c98502bc885f6eda5046de00cdb3c976cad6.zip
git-5c51c98502bc885f6eda5046de00cdb3c976cad6.tar.gz
git-5c51c98502bc885f6eda5046de00cdb3c976cad6.tar.bz2
rev-list --abbrev-commit
This should make --pretty=oneline a whole lot more readable for people using 80-column terminals. Originally from Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-list.c')
-rw-r--r--rev-list.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c
index 22141e2..1301502 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -30,6 +30,7 @@ static const char rev_list_usage[] =
" --unpacked\n"
" --header | --pretty\n"
" --abbrev=nr | --no-abbrev\n"
+" --abbrev-commit\n"
" special purpose:\n"
" --bisect"
;
@@ -39,6 +40,7 @@ struct rev_info revs;
static int bisect_list = 0;
static int verbose_header = 0;
static int abbrev = DEFAULT_ABBREV;
+static int abbrev_commit = 0;
static int show_timestamp = 0;
static int hdr_termination = 0;
static const char *commit_prefix = "";
@@ -52,7 +54,10 @@ static void show_commit(struct commit *commit)
fputs(commit_prefix, stdout);
if (commit->object.flags & BOUNDARY)
putchar('-');
- fputs(sha1_to_hex(commit->object.sha1), stdout);
+ if (abbrev_commit && abbrev)
+ fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
+ else
+ fputs(sha1_to_hex(commit->object.sha1), stdout);
if (revs.parents) {
struct commit_list *parents = commit->parents;
while (parents) {
@@ -319,6 +324,14 @@ int main(int argc, const char **argv)
abbrev = 0;
continue;
}
+ if (!strcmp(arg, "--abbrev")) {
+ abbrev = DEFAULT_ABBREV;
+ continue;
+ }
+ if (!strcmp(arg, "--abbrev-commit")) {
+ abbrev_commit = 1;
+ continue;
+ }
if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev && abbrev < MINIMUM_ABBREV)