mirror of
https://github.com/git/git.git
synced 2024-09-27 05:11:36 +02:00
Merge branch 'ob/sequencer-empty-hint-fix'
The use of API for consistency between two calls to require_clean_work_tree() from the sequencer code has been cleaned up. * ob/sequencer-empty-hint-fix: sequencer: rectify empty hint in call of require_clean_work_tree()
This commit is contained in:
commit
3525f1dbc1
@ -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))
|
||||
goto cleanup;
|
||||
|
||||
if (require_clean_work_tree(r, "rebase", "", 1, 1))
|
||||
if (require_clean_work_tree(r, "rebase", NULL, 1, 1))
|
||||
goto cleanup;
|
||||
|
||||
todo_list_write_total_nr(&new_todo);
|
||||
|
@ -2655,8 +2655,12 @@ int require_clean_work_tree(struct repository *r,
|
||||
}
|
||||
|
||||
if (err) {
|
||||
if (hint)
|
||||
if (hint) {
|
||||
if (!*hint)
|
||||
BUG("empty hint passed to require_clean_work_tree();"
|
||||
" use NULL instead");
|
||||
error("%s", hint);
|
||||
}
|
||||
if (!gently)
|
||||
exit(128);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user