unpack-trees: make sparse path messages sound like warnings

The messages for problems with sparse paths are phrased as errors that cause the operation to abort, even though we are not making the operation abort. Reword the messages to make sense in their new context. Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Elijah Newren committed Mar 27, 2020 at 00:48 UTC 22ab0b37d85080d8932e992e183b2f86e67bff19

2 files changed +7 -7

t/t1091-sparse-checkout-builtin.sh

+3 -3

@@ -288,7 +288,7 @@ test_expect_success 'not-up-to-date does not block rest of sparsification' '

288

289 git -C repo sparse-checkout set deep/deeper1 2>err &&

290

291 - test_i18ngrep "Cannot update sparse checkout" err &&

291 + test_i18ngrep "The following paths are not up to date" err &&

292 test_cmp expect repo/.git/info/sparse-checkout &&

293 check_files repo/deep a deeper1 deeper2 &&

294 check_files repo/deep/deeper1 a deepest &&

@@ -328,10 +328,10 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'

328 echo dirty >dirty/folder1/a &&

329

330 git -C dirty sparse-checkout init 2>err &&

331 - test_i18ngrep "warning.*Cannot update sparse checkout" err &&

331 + test_i18ngrep "warning.*The following paths are not up to date" err &&

332

333 git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&

334 - test_i18ngrep "warning.*Cannot update sparse checkout" err &&

334 + test_i18ngrep "warning.*The following paths are not up to date" err &&

335 test_path_is_file dirty/folder1/a &&

336

337 git -C dirty sparse-checkout disable 2>err &&

unpack-trees.c

+4 -4

@@ -50,10 +50,10 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {

50 "",

52 /* WARNING_SPARSE_NOT_UPTODATE_FILE */

53 - "Entry '%s' not uptodate. Cannot update sparse checkout.",

53 + "Path '%s' not uptodate; will not remove from working tree.",

55 /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */

56 - "Working tree file '%s' would be overwritten by sparse checkout update.",

56 + "Path '%s' already present; will not overwrite with sparse update.",

57 };

59 #define ERRORMSG(o,type) \

@@ -172,9 +172,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,

172 _("Cannot update submodule:\n%s");

173

174 msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] =

175 - _("Cannot update sparse checkout: the following entries are not up to date:\n%s");

175 + _("The following paths are not up to date and were left despite sparse patterns:\n%s");

176 msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] =

177 - _("The following working tree files would be overwritten by sparse checkout update:\n%s");

177 + _("The following paths were already present and thus not updated despite sparse patterns:\n%s");

178

179 opts->show_all_errors = 1;

180 /* rejected paths may not have a static buffer */