Merge branch 'ps/bisect-double-free-fix'

gitster · gitster · commit 8c917be5d29c · 2024-12-04T10:14:46.000+09:00
Work around Coverity warning that would not trigger in practice.

* ps/bisect-double-free-fix:
  bisect: address Coverity warning about potential double free
diff --git a/bisect.c b/bisect.c
@@ -442,8 +442,6 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
 			best->next = NULL;
 		}
 		*reaches = weight(best);
-	} else {
-		free_commit_list(*commit_list);
 	}
 	*commit_list = best;
 
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
@@ -308,4 +308,9 @@ test_expect_success '--bisect-all --first-parent' '
 	test_cmp expect actual
 '
 
+test_expect_success '--bisect without any revisions' '
+	git rev-list --bisect HEAD..HEAD >out &&
+	test_must_be_empty out
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -442,8 +442,6 @@ void find_bisection(struct commit_list *commit_list, int reaches,`
`442`	`442`	`best->next = NULL;`
`443`	`443`	`}`
`444`	`444`	`*reaches = weight(best);`
`445`		`- } else {`
`446`		`- free_commit_list(*commit_list);`
`447`	`445`	`}`
`448`	`446`	`*commit_list = best;`
`449`	`447`
Original file line number	Diff line number	Diff line change
`@@ -308,4 +308,9 @@ test_expect_success '--bisect-all --first-parent' '`
`308`	`308`	`test_cmp expect actual`
`309`	`309`	`'`
`310`	`310`
	`311`	`+test_expect_success '--bisect without any revisions' '`
	`312`	`+ git rev-list --bisect HEAD..HEAD >out &&`
	`313`	`+ test_must_be_empty out`
	`314`	`+'`
	`315`	`+`
`311`	`316`	`test_done`