Re: [RFC/PATCH] reset: accept "git reset <removed file>"

> Suppose I try to use "git reset" to un-add an new, unwanted file:
>
> 	echo hello >foo.c
> 	git add foo.c
> 	rm foo.c; # bad file! bad!
> 	git reset foo.c
>
> The file foo.c does not exist on disk, so "git reset" rejects the
> request with
>
> 	fatal: ambiguous argument 'foo.c': unknown revision or path not in the working tree.
> 	Use '--' to separate paths from revisions
>
> Git can do better: since foo.c is not a revision and has an entry in
> the index, it is clear the request refers to a path and not a rev.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---

> diff --git a/builtin/reset.c b/builtin/reset.c
> index 0037be4..7d23d75 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -295,7 +295,13 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
>  			rev = argv[i++];
>  		} else {
>  			/* Otherwise we treat this as a filename */
> -			verify_filename(prefix, argv[i]);
> +			const char *name = argv[i];
> +			if (prefix)
> +				name = prefix_filename(prefix, strlen(prefix), name);
> +			if (read_cache() < 0)
> +				die("Could not read index");
> +			if (cache_name_pos(name, strlen(name)) < 0)
> +				verify_filename(prefix, argv[i]);
>  		}
>  	}