undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-log: match rev-list --abbrev and --abbrev-commit

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-07 22:34:11 -07:00
parent ad0b46bf4a
commit f0853837d6
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
git.c
View File

@ -283,6 +283,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
char *buf = xmalloc(LOGSIZE); char *buf = xmalloc(LOGSIZE);
static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT; static enum cmit_fmt commit_format = CMIT_FMT_DEFAULT;
int abbrev = DEFAULT_ABBREV; int abbrev = DEFAULT_ABBREV;
int abbrev_commit = 0;
const char *commit_prefix = "commit "; const char *commit_prefix = "commit ";
argc = setup_revisions(argc, argv, &rev, "HEAD"); argc = setup_revisions(argc, argv, &rev, "HEAD");
@ -296,6 +297,12 @@ static int cmd_log(int argc, const char **argv, char **envp)
else if (!strcmp(arg, "--no-abbrev")) { else if (!strcmp(arg, "--no-abbrev")) {
abbrev = 0; abbrev = 0;
} }
else if (!strcmp(arg, "--abbrev")) {
abbrev = DEFAULT_ABBREV;
}
else if (!strcmp(arg, "--abbrev-commit")) {
abbrev_commit = 1;
}
else if (!strncmp(arg, "--abbrev=", 9)) { else if (!strncmp(arg, "--abbrev=", 9)) {
abbrev = strtoul(arg + 9, NULL, 10); abbrev = strtoul(arg + 9, NULL, 10);
if (abbrev && abbrev < MINIMUM_ABBREV) if (abbrev && abbrev < MINIMUM_ABBREV)
@ -311,8 +318,12 @@ static int cmd_log(int argc, const char **argv, char **envp)
prepare_revision_walk(&rev); prepare_revision_walk(&rev);
setup_pager(); setup_pager();
while ((commit = get_revision(&rev)) != NULL) { while ((commit = get_revision(&rev)) != NULL) {
printf("%s%s", commit_prefix, fputs(commit_prefix, stdout);
sha1_to_hex(commit->object.sha1)); if (abbrev_commit && abbrev)
fputs(find_unique_abbrev(commit->object.sha1, abbrev),
stdout);
else
fputs(sha1_to_hex(commit->object.sha1), stdout);
if (rev.parents) { if (rev.parents) {
struct commit_list *parents = commit->parents; struct commit_list *parents = commit->parents;
while (parents) { while (parents) {