diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:16 +0900 |
| commit | a00b1127ce09bb963590faaef342618f719e7cc4 (patch) | |
| tree | 7cc491da194a5961e35368c564c245faa5bcaa3d /wt-status.c | |
| parent | Merge branch 'ts/unpacklimit-config-fix' into maint-2.42 (diff) | |
| parent | sequencer: rectify empty hint in call of require_clean_work_tree() (diff) | |
| download | git-a00b1127ce09bb963590faaef342618f719e7cc4.tar.gz git-a00b1127ce09bb963590faaef342618f719e7cc4.zip | |
Merge branch 'ob/sequencer-empty-hint-fix' into maint-2.42
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()
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 5b1378965c..bdbcf73cbf 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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); } |