diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@gmx.de> | 2023-08-24 17:00:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-24 17:58:05 +0200 |
| commit | a9b5955e07793ceadaad05315c1599226d01292f (patch) | |
| tree | bef2851dcda8a16901e9d202b7b193090b8eadf0 /wt-status.c | |
| parent | Merge branch 'jk/redact-h2h3-headers-fix' into maint-2.41 (diff) | |
| download | git-a9b5955e07793ceadaad05315c1599226d01292f.tar.xz git-a9b5955e07793ceadaad05315c1599226d01292f.zip | |
sequencer: rectify empty hint in call of require_clean_work_tree()
The canonical way to represent "no error hint" is making it NULL, which
shortcuts the error() call altogether. This fixes the output by removing
the line which said just "error:", which would appear when the worktree
is dirtied while editing the initial rebase todo file. This was
introduced by 97e1873 (rebase -i: rewrite complete_action() in C,
2018-08-28), which did a somewhat inaccurate conversion from shell.
To avoid that such bugs re-appear, test for the condition in
require_clean_work_tree().
Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 068b76ef6d..d48ee467a1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -2651,8 +2651,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); } |