diff options
| author |  Thomas Rast <trast@student.ethz.ch> | 2010-10-17 21:23:22 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-18 16:10:57 -0700 |
| commit | 55846b9abd128185388418e025651cfd6a299a0e (patch) | |
| tree | ca0457d27b1e5d57c8c5c3a5f47c50a355c69f81 /t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side | |
| parent | prefix_filename(): safely handle the case where pfx_len=0 (diff) | |
| download | tgif-55846b9abd128185388418e025651cfd6a299a0e.tar.xz | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side')
0 files changed, 0 insertions, 0 deletions