threads / patch / 44059

patchDo not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

Subject: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

## tl;dr

4 messages between Sep 11, 2016 and Sep 12, 2016. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Mikhail Filippov· Sep 11, 2016, 20:25 UTC · lore

---
 merge-recursive.c                    |  9 +++++---
 t/t6042-merge-rename-corner-cases.sh | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 3 deletions(-)

Show changes to 2 files +48 −3

merge-recursive.c, t/t6042-merge-rename-corner-cases.sh

diff --git a/merge-recursive.c b/merge-recursive.c
index e349126..25dc701 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1724,9 +1724,12 @@ static int merge_content(struct merge_options *o,
 		 */
 		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
 		if (!path_renamed_outside_HEAD) {
-			add_cacheinfo(o, mfi.mode, &mfi.oid, path,
-				      0, (!o->call_depth), 0);
-			return mfi.clean;
+			struct stat st;
+			if (lstat(path, &st) == 0) {
+				add_cacheinfo(o, mfi.mode, &mfi.oid, path,
+					      0, (!o->call_depth), 0);
+				return mfi.clean;
+			}
 		}
 	} else
 		output(o, 2, _("Auto-merging %s"), path);
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6042-merge-rename-corner-cases.sh
index 411550d..2073e49 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6042-merge-rename-corner-cases.sh
@@ -575,4 +575,46 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
 	test ! -f c
 '
 
+test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
+	git rm -rf . &&
+	git clean -fdqx &&
+	rm -rf .git &&
+	git init &&
+
+	echo output >.gitignore &&
+	echo .gitignore >>.gitignore &&
+
+	echo b1 >b1 &&
+	git add b1 &&
+	git commit -m b1 &&
+
+	mkdir excluded &&
+	echo problem >excluded/to-be-moved.txt &&
+	git add excluded/to-be-moved.txt &&
+	git commit -m to-be-moved &&
+	git tag split_point &&
+
+	echo b2 >b2 &&
+	git add b2 &&
+	git commit -m b2 &&
+	git tag b2 &&
+
+	git reset --hard split_point &&
+
+	git mv excluded/to-be-moved.txt excluded/moved.txt &&
+	git commit -m move &&
+	git tag b1 &&
+
+	git config core.sparsecheckout true &&
+	echo "/*" >.git/info/sparse-checkout &&
+	echo "!excluded/" >>.git/info/sparse-checkout &&
+	git read-tree -mu HEAD &&
+
+	git merge -m merge b2 &&
+
+	git status >output &&
+	cp output /tmp/a &&
+	test_i18ngrep "nothing to commit" output
+'
+
 test_done

-- 
2.7.4 (Apple Git-66)

Junio C Hamano· Sep 11, 2016, 23:24 UTC · re: Mikhail Filippov · lore

Re: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

Mikhail Filippov <mikhail@filippov.me> writes:

> ---

You'd need a lot more explanation on why this is needed (i.e. without it what behaviour you would get, and why that behaviour is wrong).

Show 21 quoted lines

>  merge-recursive.c                    |  9 +++++---
>  t/t6042-merge-rename-corner-cases.sh | 42 ++++++++++++++++++++++++++++++++++++
>  2 files changed, 48 insertions(+), 3 deletions(-)
>
> diff --git a/merge-recursive.c b/merge-recursive.c
> index e349126..25dc701 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1724,9 +1724,12 @@ static int merge_content(struct merge_options *o,
>  		 */
>  		path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
>  		if (!path_renamed_outside_HEAD) {
> -			add_cacheinfo(o, mfi.mode, &mfi.oid, path,
> -				      0, (!o->call_depth), 0);
> -			return mfi.clean;
> +			struct stat st;
> +			if (lstat(path, &st) == 0) {
> +				add_cacheinfo(o, mfi.mode, &mfi.oid, path,
> +					      0, (!o->call_depth), 0);
> +				return mfi.clean;
> +			}

I cannot guess what you are trying to achieve without explanation in the proposed log message, but I can say that this unconditional checking of a working tree file cannot be correct (there may or may not be other things that are wrong with this change, which cannot be judged without more information).

Imagine your o->call_depth is not zero, i.e. we are making a virtual common ancestor with this merge, in which case any of the three trees involved may have nothing to do with the current working tree files.

Show 5 quoted lines

> +test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
> +	git rm -rf . &&
> +	git clean -fdqx &&
> +	rm -rf .git &&
> +	git init &&

Yuck. This is inherited from existing tests but I think they need to be cleaned up. It is not your fault, and it is not in the scope of this change.

> +	git status >output &&
> +	cp output /tmp/a &&

Huh?

> +	test_i18ngrep "nothing to commit" output
> +'
> +
>  test_done

Mikhail Filippov· Sep 12, 2016, 08:38 UTC · re: Junio C Hamano · lore

Re: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

It's a very unexpected behaviour when a user sees a deleted file after a merge with enabled sparse-checkout. Moreover, when the user resolves merge conflicts and commits the changes with the command "git commit -am xxx", a repository can be broken because all the moved files will be deleted. Finally, it's really hard to find a user who deleted these files because "git log file" doesn't show any merge commits by default. I'm not sure that my fix is correct but I checked all tests and I didn't find a better way to prevent files deleting.

12.09.2016, 02:24, "Junio C Hamano" <gitster@pobox.com>:

Show 60 quoted lines

>    Mikhail Filippov <mikhail@filippov.me> writes:
>
>>     ---
>
>    You'd need a lot more explanation on why this is needed
>    (i.e. without it what behaviour you would get, and why that
>    behaviour is wrong).
>
>>      merge-recursive.c | 9 +++++---
>>      t/t6042-merge-rename-corner-cases.sh | 42 ++++++++++++++++++++++++++++++++++++
>>      2 files changed, 48 insertions(+), 3 deletions(-)
>>
>>     diff --git a/merge-recursive.c b/merge-recursive.c
>>     index e349126..25dc701 100644
>>     --- a/merge-recursive.c
>>     +++ b/merge-recursive.c
>>     @@ -1724,9 +1724,12 @@ static int merge_content(struct merge_options *o,
>>                       */
>>                      path_renamed_outside_HEAD = !path2 || !strcmp(path, path2);
>>                      if (!path_renamed_outside_HEAD) {
>>     - add_cacheinfo(o, mfi.mode, &mfi.oid, path,
>>     - 0, (!o->call_depth), 0);
>>     - return mfi.clean;
>>     + struct stat st;
>>     + if (lstat(path, &st) == 0) {
>>     + add_cacheinfo(o, mfi.mode, &mfi.oid, path,
>>     + 0, (!o->call_depth), 0);
>>     + return mfi.clean;
>>     + }
>
>    I cannot guess what you are trying to achieve without explanation in
>    the proposed log message, but I can say that this unconditional
>    checking of a working tree file cannot be correct (there may or may
>    not be other things that are wrong with this change, which cannot be
>    judged without more information).
>
>    Imagine your o->call_depth is not zero, i.e. we are making a virtual
>    common ancestor with this merge, in which case any of the three
>    trees involved may have nothing to do with the current working tree
>    files.
>
>>     +test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
>>     + git rm -rf . &&
>>     + git clean -fdqx &&
>>     + rm -rf .git &&
>>     + git init &&
>
>    Yuck. This is inherited from existing tests but I think they need
>    to be cleaned up. It is not your fault, and it is not in the scope
>    of this change.
>
>>     + git status >output &&
>>     + cp output /tmp/a &&
>
>    Huh?
>
>>     + test_i18ngrep "nothing to commit" output
>>     +'
>>     +
>>      test_done

-- 
Mikhail Filippov 
Software Developer
JetBrains
http://jetbrains.com
“The Drive To Develop"

Mikhail Filippov· Sep 12, 2016, 11:07 UTC · re: Junio C Hamano · lore

Re: [PATCH] Do not record unstaged deleted file upon recursive merge if file was moved outside of working tree with enabled sparse-checkout.

Show 9 quoted lines

>>  +test_expect_success 'move file/sparse-checkout/merge should not delete moved file' '
>>  + git rm -rf . &&
>>  + git clean -fdqx &&
>>  + rm -rf .git &&
>>  + git init &&
>
> Yuck. This is inherited from existing tests but I think they need
> to be cleaned up. It is not your fault, and it is not in the scope
> of this change.

It's part need for cleanup repository from the previous case.