author | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Feb 2007 21:12:52 +0000 (13:12 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 17 Feb 2007 21:13:32 +0000 (13:13 -0800) | ||
commit | dc7b24364dcbe9ab74d937c92af9999ac1a2db0b | |
tree | e756ecd8a36664927f35e0af35ab588f0212ec5d | tree | snapshot |
parent | 437b1b20df4b356c9342dac8d38849f24ef44f27 | commit | diff |
Teach 'git apply' to look at $GIT_DIR/config
When neither --index nor --cached was used, git-apply did not
try calling setup_git_directory(), which means it did not look
at configuration files at all. This fixes it to call the setup
function but still allow the command to be run in a directory
not controlled by git.
The bug probably meant that 'git apply', not moving up to the
toplevel, did not apply properly formatted diffs from the
toplevel when you are inside a subdirectory, even though 'git
apply --index' would. As a side effect, this patch fixes it as
well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
When neither --index nor --cached was used, git-apply did not
try calling setup_git_directory(), which means it did not look
at configuration files at all. This fixes it to call the setup
function but still allow the command to be run in a directory
not controlled by git.
The bug probably meant that 'git apply', not moving up to the
toplevel, did not apply properly formatted diffs from the
toplevel when you are inside a subdirectory, even though 'git
apply --index' would. As a side effect, this patch fixes it as
well.
Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-apply.c | diff | blob | history | |
t/t4119-apply-config.sh | [new file with mode: 0755] | blob |