mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ef/cherry-abbrev'

Browse Source 
* ef/cherry-abbrev:
  ls: remove redundant logic
  cherry: support --abbrev option
This commit is contained in:
Junio C Hamano
2010-04-03 12:28:40 -07:00
parent 0cb050abc2 531e758d9c
commit 40a56f45bc
3 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
builtin/log.c
View File

@ -1303,8 +1303,11 @@ static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
return -1;
}
static const char cherry_usage[] =
"git cherry [-v] [<upstream> [<head> [<limit>]]]";
static const char * const cherry_usage[] = {
"git cherry [-v] [<upstream> [<head> [<limit>]]]",
NULL
};
int cmd_cherry(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
@ -1315,26 +1318,25 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
const char *upstream;
const char *head = "HEAD";
const char *limit = NULL;
int verbose = 0;
int verbose = 0, abbrev = 0;
if (argc > 1 && !strcmp(argv[1], "-v")) {
verbose = 1;
argc--;
argv++;
}
struct option options[] = {
OPT__ABBREV(&abbrev),
OPT__VERBOSE(&verbose),
OPT_END()
};
if (argc > 1 && !strcmp(argv[1], "-h"))
usage(cherry_usage);
argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
switch (argc) {
case 4:
limit = argv[3];
/* FALLTHROUGH */
case 3:
head = argv[2];
limit = argv[2];
/* FALLTHROUGH */
case 2:
upstream = argv[1];
head = argv[1];
/* FALLTHROUGH */
case 1:
upstream = argv[0];
break;
default:
current_branch = branch_get(NULL);
@ -1344,7 +1346,7 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
fprintf(stderr, "Could not find a tracked"
" remote branch, please"
" specify <upstream> manually.\n");
usage(cherry_usage);
usage_with_options(cherry_usage, options);
}
upstream = current_branch->merge[0]->dst;
@ -1397,12 +1399,13 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
pretty_print_commit(CMIT_FMT_ONELINE, commit,
&buf, &ctx);
printf("%c %s %s\n", sign,
sha1_to_hex(commit->object.sha1), buf.buf);
find_unique_abbrev(commit->object.sha1, abbrev),
buf.buf);
strbuf_release(&buf);
}
else {
printf("%c %s\n", sign,
sha1_to_hex(commit->object.sha1));
find_unique_abbrev(commit->object.sha1, abbrev));
}
list = list->next;