| commit | 55846b9abd128185388418e025651cfd6a299a0e | |
| author | Thomas Rast <trast@student.ethz.ch> | |
| Sun, 17 Oct 2010 19:23:22 +0000 (17 21:23 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 Oct 2010 23:10:57 +0000 (18 16:10 -0700) | ||
| tree | ca0457d27b1e5d57c8c5c3a5f47c50a355c69f81 | treesnapshot (tar.gz zip) |
| parent | 9e5f5d4cfea5bb7706f1f8bb07795d52d37a59fe | commitdiff |
merge-file: correctly find files when called in subdir
Since b541248 (merge.conflictstyle: choose between "merge" and "diff3
-m" styles, 2008-08-29), git-merge-file uses setup_directory_gently(),
thus cd'ing around to find any possible config files to use.
This broke merge-file when it is called from within a subdirectory of
a repository, and the arguments are all relative paths.
Fix by prepending the prefix, as passed down from the main git
setup code, if there is any.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since b541248 (merge.conflictstyle: choose between "merge" and "diff3
-m" styles, 2008-08-29), git-merge-file uses setup_directory_gently(),
thus cd'ing around to find any possible config files to use.
This broke merge-file when it is called from within a subdirectory of
a repository, and the arguments are all relative paths.
Fix by prepending the prefix, as passed down from the main git
setup code, if there is any.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/merge-file.c | diffblobblamehistory | |
| t/t6023-merge-file.sh | diffblobblamehistory |