diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-07 17:59:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-07 17:59:10 -0700 |
| commit | f1fffec77e38ee4a379b6e3169602dd2bfb3acc7 (patch) | |
| tree | c9b14af349f89d78e6ddb2cd2127de9825900e3a | |
| parent | Merge branch 'jc/blame' (diff) | |
| parent | rev-list --abbrev-commit (diff) | |
| download | tgif-f1fffec77e38ee4a379b6e3169602dd2bfb3acc7.tar.xz | |
Merge branch 'ew/rev-abbrev'
* ew/rev-abbrev:
rev-list --abbrev-commit
| -rw-r--r-- | rev-list.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index 22141e2b04..1301502627 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) |