Merge branch 'vn/reset-deleted-ita' into pu

"git reset HEAD [<pathspec>]" did not reset an empty file that was
added with the intent-to-add bit.

* vn/reset-deleted-ita:
  reset: unstage empty deleted ita files

Author: gitster

builtin/reset.c

@@ -164,6 +164,7 @@ static int read_from_tree(const struct pathspec *pathspec,
 	opt.format_callback_data = &intent_to_add;
 	opt.flags.override_submodule_config = 1;
 	opt.repo = the_repository;
+	opt.ita_invisible_in_index = 1;
 
 	if (do_diff_cache(tree_oid, &opt))
 		return 1;

t/t7102-reset.sh

@@ -566,4 +566,15 @@ test_expect_success 'reset --mixed sets up work tree' '
 	test_must_be_empty actual
 '
 
+test_expect_success 'reset --mixed adds deleted intent-to-add file back to index' '
+	echo "nonempty" >nonempty &&
+	>empty &&
+	git add nonempty empty &&
+	git commit -m "create files to be deleted" &&
+	git rm --cached nonempty empty &&
+	git add -N nonempty empty &&
+	git reset HEAD nonempty empty &&
+	git diff --cached --exit-code HEAD
+'
+
 test_done