worktree: rename copy-pasted variable
As the commit message of 04a3dfb8b5 ("worktree.c: check whether branch is bisected in another worktree", 2016-04-22) indicates, the function `is_worktree_being_bisected()` is based on the older function `is_worktree_being_rebased()`. This heritage can also be seen in the name of the variable where we store our return value: It was never adapted while copy-editing and remains as `found_rebase`. Rename the variable to make clear that we're looking for a bisect(ion), nothing else. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin Ågren committed
Sep 27, 2020 at 15:15 UTC
fb07bd42975bcbfbc29d4a3ef1bff1039a469336
1 file changed
+6
-6
worktree.c
+6
-6
@@ -365,15 +365,15 @@ int is_worktree_being_bisected(const struct worktree *wt,
365
const char *target)
366
{
367
struct wt_status_state state;
368
- int found_rebase;
368
+ int found_bisect;
369
370
memset(&state, 0, sizeof(state));
371
- found_rebase = wt_status_check_bisect(wt, &state) &&
372
- state.branch &&
373
- starts_with(target, "refs/heads/") &&
374
- !strcmp(state.branch, target + strlen("refs/heads/"));
371
+ found_bisect = wt_status_check_bisect(wt, &state) &&
372
+ state.branch &&
373
+ starts_with(target, "refs/heads/") &&
374
+ !strcmp(state.branch, target + strlen("refs/heads/"));
375
wt_status_state_free_buffers(&state);
376
- return found_rebase;
376
+ return found_bisect;
377
}
378
379
/*