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

Merge branch 'cn/maint-branch-with-bad'

Browse Source 
* cn/maint-branch-with-bad:
  branch: don't assume the merge filter ref exists

Conflicts:
	t/t3200-branch.sh
This commit is contained in:
Junio C Hamano 2012-03-01 14:44:17 -08:00
commit 7d47367a47
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/branch.c
View File

@ -530,6 +530,10 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru
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);
if (!filter)
die("object '%s' does not point to a commit",
sha1_to_hex(merge_filter_ref));
filter->object.flags |= UNINTERESTING; filter->object.flags |= UNINTERESTING;
add_pending_object(&ref_list.revs, add_pending_object(&ref_list.revs,
(struct object *) filter, ""); (struct object *) filter, "");

4
t/t3200-branch.sh
View File

@ -653,4 +653,8 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
) )
' '
test_expect_success '--merged catches invalid object names' '
test_must_fail git branch --merged 0000000000000000000000000000000000000000
'
test_done test_done