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

Merge branch 'ob/sequencer-empty-hint-fix' into maint-2.42

Browse Source 
The use of API between two calls to require_clean_work_tree() from
the sequencer code has been cleaned up for consistency.

* ob/sequencer-empty-hint-fix:
  sequencer: rectify empty hint in call of require_clean_work_tree()
This commit is contained in:
Junio C Hamano
2023-11-02 16:53:16 +09:00
parent 7f8314f277 a9b5955e07
commit a00b1127ce
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -6229,7 +6229,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
if (checkout_onto(r, opts, onto_name, &oid, orig_head)) if (checkout_onto(r, opts, onto_name, &oid, orig_head))
goto cleanup; goto cleanup;
if (require_clean_work_tree(r, "rebase", "", 1, 1)) if (require_clean_work_tree(r, "rebase", NULL, 1, 1))
goto cleanup; goto cleanup;
todo_list_write_total_nr(&new_todo); todo_list_write_total_nr(&new_todo);

6
wt-status.c
View File

@ -2655,8 +2655,12 @@ int require_clean_work_tree(struct repository *r,
} }
if (err) { if (err) {
if (hint) if (hint) {
if (!*hint)
BUG("empty hint passed to require_clean_work_tree();"
" use NULL instead");
error("%s", hint); error("%s", hint);
}
if (!gently) if (!gently)
exit(128); exit(128);
} }