Re: [PATCH 1/2] sparse checkout: show error messages when worktree shaping fails

4 messages, 3 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH 1/2] sparse checkout: show error messages when worktree shaping fails

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:52:05

Please add a test when you reroll this, hopefully with help from Joshua.

Thanks.

[PATCH v2 1/2] sparse checkout: show error messages when worktree shaping fails

From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:52:05

verify_* functions can queue errors up and to be printed later at
label return_failed. In case of errors, do not go to label "done"
directly because all queued messages would be dropped on the floor.

Found-by: Joshua Jensen [off-list ref]
Tracked-down-by: Michael J Gruber [off-list ref]
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
 Now print all errors.

 t/t1011-read-tree-sparse-checkout.sh |   15 +++++++++++++++
 unpack-trees.c                       |   13 ++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index 018c354..efcd8ab 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh

@@ -234,4 +234,19 @@ test_expect_success 'read-tree --reset removes outside worktree' '
 	test_cmp empty result
 '
 
+test_expect_success 'print errors when failed to update worktree' '
+	echo sub >.git/info/sparse-checkout &&
+	git checkout -f init &&
+	mkdir sub &&
+	touch sub/added sub/addedtoo &&
+	test_must_fail git checkout top 2>actual &&
+	cat >expected <<\EOF &&
+error: The following untracked working tree files would be overwritten by checkout:
+	sub/added
+	sub/addedtoo
+Please move or remove them before you can switch branches.
+EOF
+	test_cmp expected actual
+'
+
 test_done

diff --git a/unpack-trees.c b/unpack-trees.c
index cc616c3..fcf40a0 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c

@@ -1089,6 +1089,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		 */
 		mark_new_skip_worktree(o->el, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
 
+		ret = 0;
 		for (i = 0; i < o->result.cache_nr; i++) {
 			struct cache_entry *ce = o->result.cache[i];

@@ -1101,17 +1102,23 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 			 * correct CE_NEW_SKIP_WORKTREE
 			 */
 			if (ce->ce_flags & CE_ADDED &&
-			    verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
-					return -1;
+			    verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
+				if (!o->show_all_errors)
+					goto return_failed;
+				ret = -1;
+			}
 
 			if (apply_sparse_checkout(ce, o)) {
+				if (!o->show_all_errors)
+					goto return_failed;
 				ret = -1;
-				goto done;
 			}
 			if (!ce_skip_worktree(ce))
 				empty_worktree = 0;
 
 		}
+		if (ret < 0)
+			goto return_failed;
 		if (o->result.cache_nr && empty_worktree) {
 			/* dubious---why should this fail??? */
 			ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");

-- 
1.7.3.1.256.g2539c.dirty

[PATCH v2 2/2] Add explanation why we do not allow to sparse checkout to empty working tree

From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2016-06-15 22:52:05

Signed-off-by: Nguyễn Thái Ngọc Duy <redacted>
---
 unpack-trees.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index fcf40a0..bacb473 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c

@@ -1119,8 +1119,13 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		}
 		if (ret < 0)
 			goto return_failed;
+		/*
+		 * Sparse checkout is meant to narrow down checkout area
+		 * but it does not make sense to narrow down to empty working
+		 * tree. This is usually a mistake in sparse checkout rules.
+		 * Do not allow users to do that.
+		 */
 		if (o->result.cache_nr && empty_worktree) {
-			/* dubious---why should this fail??? */
 			ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
 			goto done;
 		}

-- 
1.7.3.1.256.g2539c.dirty

Re: [PATCH v2 1/2] sparse checkout: show error messages when worktree shaping fails

From: Joshua Jensen <hidden>
Date: 2016-06-15 22:52:05

----- Original Message -----
From: Nguyễn Thái Ngọc Duy
Date: 9/22/2011 5:24 AM

quoted hunk

diff --git a/unpack-trees.c b/unpack-trees.c
index cc616c3..fcf40a0 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c

@@ -1089,6 +1089,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
  		 */
  		mark_new_skip_worktree(o->el,&o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);

+		ret = 0;
  		for (i = 0; i<  o->result.cache_nr; i++) {
  			struct cache_entry *ce = o->result.cache[i];

@@ -1101,17 +1102,23 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
  			 * correct CE_NEW_SKIP_WORKTREE
  			 */
  			if (ce->ce_flags&  CE_ADDED&&
-			    verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
-					return -1;
+			    verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
+				if (!o->show_all_errors)
+					goto return_failed;
+				ret = -1;
+			}

  			if (apply_sparse_checkout(ce, o)) {
+				if (!o->show_all_errors)
+					goto return_failed;
  				ret = -1;
-				goto done;
  			}
  			if (!ce_skip_worktree(ce))
  				empty_worktree = 0;

  		}
+		if (ret<  0)
+			goto return_failed;
  		if (o->result.cache_nr&&  empty_worktree) {
  			/* dubious---why should this fail??? */
  			ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");

I can confirm that this version of the patch works for me with multiple 
untracked files in a sparse checkout.

-Josh

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help