unpack-trees: provide warnings on sparse updates for unmerged paths too
When sparse-checkout runs to update the list of sparsity patterns, it gives warnings if it can't remove paths from the working tree because those files have dirty changes. Add a similar warning for unmerged paths as well. 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
ebb568b9e2539ce2dbb3853ff3d4869a5c690601
3 files changed
+56
t/t1091-sparse-checkout-builtin.sh
+25
@@ -345,6 +345,31 @@ test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status'
345
test_path_is_file dirty/folder1/a
346
'
347
348
+test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged status' '
349
+ git clone repo unmerged &&
350
+
351
+ cat >input <<-EOF &&
352
+ 0 0000000000000000000000000000000000000000 folder1/a
353
+ 100644 $(git -C unmerged rev-parse HEAD:folder1/a) 1 folder1/a
354
+ EOF
355
+ git -C unmerged update-index --index-info <input &&
356
+
357
+ git -C unmerged sparse-checkout init 2>err &&
358
+ test_i18ngrep "warning.*The following paths are unmerged" err &&
359
+
360
+ git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
361
+ test_i18ngrep "warning.*The following paths are unmerged" err &&
362
+ test_path_is_file dirty/folder1/a &&
363
+
364
+ git -C unmerged sparse-checkout disable 2>err &&
365
+ test_i18ngrep "warning.*The following paths are unmerged" err &&
366
+
367
+ git -C unmerged reset --hard &&
368
+ git -C unmerged sparse-checkout init &&
369
+ git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
370
+ git -C unmerged sparse-checkout disable
371
+'
372
+
373
test_expect_success 'cone mode: set with core.ignoreCase=true' '
374
rm repo/.git/info/sparse-checkout &&
375
git -C repo sparse-checkout init --cone &&
unpack-trees.c
+30
@@ -52,6 +52,9 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
52
/* WARNING_SPARSE_NOT_UPTODATE_FILE */
53
"Path '%s' not uptodate; will not remove from working tree.",
54
55
+ /* WARNING_SPARSE_UNMERGED_FILE */
56
+ "Path '%s' unmerged; will not remove from working tree.",
57
+
58
/* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
59
"Path '%s' already present; will not overwrite with sparse update.",
60
};
@@ -173,6 +176,8 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
176
177
msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] =
178
_("The following paths are not up to date and were left despite sparse patterns:\n%s");
179
+ msgs[WARNING_SPARSE_UNMERGED_FILE] =
180
+ _("The following paths are unmerged and were left despite sparse patterns:\n%s");
181
msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] =
182
_("The following paths were already present and thus not updated despite sparse patterns:\n%s");
183
@@ -548,6 +553,23 @@ static int apply_sparse_checkout(struct index_state *istate,
553
return 0;
554
}
555
556
+static int warn_conflicted_path(struct index_state *istate,
557
+ int i,
558
+ struct unpack_trees_options *o)
559
+{
560
+ char *conflicting_path = istate->cache[i]->name;
561
+ int count = 0;
562
+
563
+ add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path);
564
+
565
+ /* Find out how many higher stage entries at same path */
566
+ while (++count < istate->cache_nr &&
567
+ !strcmp(conflicting_path,
568
+ istate->cache[i+count]->name))
569
+ /* do nothing */;
570
+ return count;
571
+}
572
+
573
static inline int call_unpack_fn(const struct cache_entry * const *src,
574
struct unpack_trees_options *o)
575
{
@@ -1793,6 +1815,14 @@ enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
1815
for (i = 0; i < o->src_index->cache_nr; i++) {
1816
struct cache_entry *ce = o->src_index->cache[i];
1817
1818
+
1819
+ if (ce_stage(ce)) {
1820
+ /* -1 because for loop will increment by 1 */
1821
+ i += warn_conflicted_path(o->src_index, i, o) - 1;
1822
+ ret = UPDATE_SPARSITY_WARNINGS;
1823
+ continue;
1824
+ }
1825
+
1826
if (apply_sparse_checkout(o->src_index, ce, o))
1827
ret = UPDATE_SPARSITY_WARNINGS;
1828
unpack-trees.h
+1
@@ -27,6 +27,7 @@ enum unpack_trees_error_types {
27
NB_UNPACK_TREES_ERROR_TYPES,
28
29
WARNING_SPARSE_NOT_UPTODATE_FILE,
30
+ WARNING_SPARSE_UNMERGED_FILE,
31
WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
32
33
NB_UNPACK_TREES_WARNING_TYPES,