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 <redacted>
Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index ed5e9059969001d4244771e32fc019cb0f7b79c6..afbde89e6055118057b695de3a93ae3a05711118 100755 (executable)
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -288,7 +288,7 @@ test_expect_success 'not-up-to-date does not block rest of sparsification' '
 
        git -C repo sparse-checkout set deep/deeper1 2>err &&
 
-       test_i18ngrep "Cannot update sparse checkout" err &&
+       test_i18ngrep "The following paths are not up to date" err &&
        test_cmp expect repo/.git/info/sparse-checkout &&
        check_files repo/deep a deeper1 deeper2 &&
        check_files repo/deep/deeper1 a deepest &&
@@ -328,10 +328,10 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'
        echo dirty >dirty/folder1/a &&
 
        git -C dirty sparse-checkout init 2>err &&
-       test_i18ngrep "warning.*Cannot update sparse checkout" err &&
+       test_i18ngrep "warning.*The following paths are not up to date" err &&
 
        git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
-       test_i18ngrep "warning.*Cannot update sparse checkout" err &&
+       test_i18ngrep "warning.*The following paths are not up to date" err &&
        test_path_is_file dirty/folder1/a &&
 
        git -C dirty sparse-checkout disable 2>err &&

diff --git a/unpack-trees.c b/unpack-trees.c
index f9a5626a670741053227cd98448cbadde1475796..484d30a53a74908c84033d3060dc55543cf773d2 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -50,10 +50,10 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
        "",
 
        /* WARNING_SPARSE_NOT_UPTODATE_FILE */
-       "Entry '%s' not uptodate. Cannot update sparse checkout.",
+       "Path '%s' not uptodate; will not remove from working tree.",
 
        /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
-       "Working tree file '%s' would be overwritten by sparse checkout update.",
+       "Path '%s' already present; will not overwrite with sparse update.",
 };
 
 #define ERRORMSG(o,type) \
@@ -172,9 +172,9 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
                _("Cannot update submodule:\n%s");
 
        msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] =
-               _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
+               _("The following paths are not up to date and were left despite sparse patterns:\n%s");
        msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] =
-               _("The following working tree files would be overwritten by sparse checkout update:\n%s");
+               _("The following paths were already present and thus not updated despite sparse patterns:\n%s");
 
        opts->show_all_errors = 1;
        /* rejected paths may not have a static buffer */