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

Merge branch 'sm/branch-broken-ref'

Browse Source 
* sm/branch-broken-ref:
  branch: don't fail listing branches if one of the commits wasn't found
  branch: exit status now reflects if branch listing finds an error
This commit is contained in:
Junio C Hamano 2010-06-21 06:02:47 -07:00
commit 1623191be4
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builtin/branch.c
View File

@ -257,9 +257,15 @@ static char *resolve_symref(const char *src, const char *prefix)
return xstrdup(dst); return xstrdup(dst);
} }
struct append_ref_cb {
struct ref_list *ref_list;
int ret;
};
static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data) static int append_ref(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
{ {
struct ref_list *ref_list = (struct ref_list*)(cb_data); struct append_ref_cb *cb = (struct append_ref_cb *)(cb_data);
struct ref_list *ref_list = cb->ref_list;
struct ref_item *newitem; struct ref_item *newitem;
struct commit *commit; struct commit *commit;
int kind, i; int kind, i;
@ -293,8 +299,10 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
commit = NULL; commit = NULL;
if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) { if (ref_list->verbose || ref_list->with_commit || merge_filter != NO_FILTER) {
commit = lookup_commit_reference_gently(sha1, 1); commit = lookup_commit_reference_gently(sha1, 1);
if (!commit) if (!commit) {
return error("branch '%s' does not point at a commit", refname); cb->ret = error("branch '%s' does not point at a commit", refname);
return 0;
}
/* Filter with with_commit if specified */ /* Filter with with_commit if specified */
if (!is_descendant_of(commit, ref_list->with_commit)) if (!is_descendant_of(commit, ref_list->with_commit))
@ -484,9 +492,10 @@ static void show_detached(struct ref_list *ref_list)
} }
} }
static void print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit) static int print_ref_list(int kinds, int detached, int verbose, int abbrev, struct commit_list *with_commit)
{ {
int i; int i;
struct append_ref_cb cb;
struct ref_list ref_list; struct ref_list ref_list;
memset(&ref_list, 0, sizeof(ref_list)); memset(&ref_list, 0, sizeof(ref_list));
@ -496,7 +505,9 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
ref_list.with_commit = with_commit; ref_list.with_commit = with_commit;
if (merge_filter != NO_FILTER) if (merge_filter != NO_FILTER)
init_revisions(&ref_list.revs, NULL); init_revisions(&ref_list.revs, NULL);
for_each_rawref(append_ref, &ref_list); cb.ref_list = &ref_list;
cb.ret = 0;
for_each_rawref(append_ref, &cb);
if (merge_filter != NO_FILTER) { if (merge_filter != NO_FILTER) {
struct commit *filter; struct commit *filter;
filter = lookup_commit_reference_gently(merge_filter_ref, 0); filter = lookup_commit_reference_gently(merge_filter_ref, 0);
@ -527,6 +538,11 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
} }
free_ref_list(&ref_list); free_ref_list(&ref_list);
if (cb.ret)
error("some refs could not be read");
return cb.ret;
} }
static void rename_branch(const char *oldname, const char *newname, int force) static void rename_branch(const char *oldname, const char *newname, int force)
@ -679,7 +695,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
if (delete) if (delete)
return delete_branches(argc, argv, delete > 1, kinds); return delete_branches(argc, argv, delete > 1, kinds);
else if (argc == 0) else if (argc == 0)
print_ref_list(kinds, detached, verbose, abbrev, with_commit); return print_ref_list(kinds, detached, verbose, abbrev, with_commit);
else if (rename && (argc == 1)) else if (rename && (argc == 1))
rename_branch(head, argv[0], rename > 1); rename_branch(head, argv[0], rename > 1);
else if (rename && (argc == 2)) else if (rename && (argc == 2))