Merge branch 'ab/merge-file-prefix'

"git merge-file" did not work correctly in a subdirectory.

* ab/merge-file-prefix:
merge-file: correctly open files when in a subdir

diff --combined builtin/merge-file.c
index 131edc245fdc0f5f8cb1e5d3da4120d072858d3f,232b76857cf4f6dbd9bec12fa12266e1afc90a5c..ea8093f6769e278c4f7871faf405fe1e3f0a7544
--- 1/builtin/merge-file.c
--- 2/builtin/merge-file.c
+++ b/builtin/merge-file.c
@@@ -5,7 -5,7 +5,7 @@@
  #include "parse-options.h"
  
  static const char *const merge_file_usage[] = {
 -      N_("git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file file2"),
 +      N_("git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> <orig-file> <file2>"),
        NULL
  };
  
@@@ -42,7 -42,7 +42,7 @@@ int cmd_merge_file(int argc, const cha
                            N_("for conflicts, use this marker size")),
                OPT__QUIET(&quiet, N_("do not warn about conflicts")),
                OPT_CALLBACK('L', NULL, names, N_("name"),
 -                           N_("set labels for file1/orig_file/file2"), &label_cb),
 +                           N_("set labels for file1/orig-file/file2"), &label_cb),
                OPT_END(),
        };
  
@@@ -90,7 -90,8 +90,8 @@@
  
        if (ret >= 0) {
                const char *filename = argv[0];
-               FILE *f = to_stdout ? stdout : fopen(filename, "wb");
+               const char *fpath = prefix_filename(prefix, prefixlen, argv[0]);
+               FILE *f = to_stdout ? stdout : fopen(fpath, "wb");
  
                if (!f)
                        ret = error("Could not open %s for writing", filename);

diff --combined t/t6023-merge-file.sh
index 3758961765635c4ce504eec1540605f65efd386a,d0df869001b6441e31bc75fb78f336c748e1640e..190ee903cf6269071809e82d61d6065f1de679c6
--- 1/t/t6023-merge-file.sh
--- 2/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@@ -69,7 -69,8 +69,8 @@@ test_expect_success 'works in subdirect
        cp new1.txt dir/a.txt &&
        cp orig.txt dir/o.txt &&
        cp new2.txt dir/b.txt &&
-       ( cd dir && git merge-file a.txt o.txt b.txt )
+       ( cd dir && git merge-file a.txt o.txt b.txt ) &&
+       test_path_is_missing a.txt
  '
  
  cp new1.txt test.txt
@@@ -77,29 -78,12 +78,29 @@@ test_expect_success "merge without conf
        "git merge-file --quiet test.txt orig.txt new2.txt"
  
  cp new1.txt test2.txt
 -test_expect_success "merge without conflict (missing LF at EOF)" \
 -      "git merge-file test2.txt orig.txt new2.txt"
 +test_expect_failure "merge without conflict (missing LF at EOF)" \
 +      "git merge-file test2.txt orig.txt new4.txt"
  
 -test_expect_success "merge result added missing LF" \
 +test_expect_failure "merge result added missing LF" \
        "test_cmp test.txt test2.txt"
  
 +cp new4.txt test3.txt
 +test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" \
 +      "git merge-file --quiet test3.txt new2.txt new3.txt"
 +
 +cat > expect.txt << EOF
 +DOMINUS regit me,
 +et nihil mihi deerit.
 +In loco pascuae ibi me collocavit,
 +super aquam refectionis educavit me;
 +animam meam convertit,
 +deduxit me super semitas jusitiae,
 +EOF
 +printf "propter nomen suum." >> expect.txt
 +
 +test_expect_success "merge does not add LF away of change" \
 +      "test_cmp test3.txt expect.txt"
 +
  cp test.txt backup.txt
  test_expect_success "merge with conflicts" \
        "test_must_fail git merge-file test.txt orig.txt new3.txt"
@@@ -124,55 -108,6 +125,55 @@@ EO
  test_expect_success "expected conflict markers" "test_cmp test.txt expect.txt"
  
  cp backup.txt test.txt
 +
 +cat > expect.txt << EOF
 +Dominus regit me, et nihil mihi deerit.
 +In loco pascuae ibi me collocavit,
 +super aquam refectionis educavit me;
 +animam meam convertit,
 +deduxit me super semitas jusitiae,
 +propter nomen suum.
 +Nam et si ambulavero in medio umbrae mortis,
 +non timebo mala, quoniam tu mecum es:
 +virga tua et baculus tuus ipsa me consolata sunt.
 +EOF
 +test_expect_success "merge conflicting with --ours" \
 +      "git merge-file --ours test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
 +cp backup.txt test.txt
 +
 +cat > expect.txt << EOF
 +DOMINUS regit me,
 +et nihil mihi deerit.
 +In loco pascuae ibi me collocavit,
 +super aquam refectionis educavit me;
 +animam meam convertit,
 +deduxit me super semitas jusitiae,
 +propter nomen suum.
 +Nam et si ambulavero in medio umbrae mortis,
 +non timebo mala, quoniam tu mecum es:
 +virga tua et baculus tuus ipsa me consolata sunt.
 +EOF
 +test_expect_success "merge conflicting with --theirs" \
 +      "git merge-file --theirs test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
 +cp backup.txt test.txt
 +
 +cat > expect.txt << EOF
 +Dominus regit me, et nihil mihi deerit.
 +DOMINUS regit me,
 +et nihil mihi deerit.
 +In loco pascuae ibi me collocavit,
 +super aquam refectionis educavit me;
 +animam meam convertit,
 +deduxit me super semitas jusitiae,
 +propter nomen suum.
 +Nam et si ambulavero in medio umbrae mortis,
 +non timebo mala, quoniam tu mecum es:
 +virga tua et baculus tuus ipsa me consolata sunt.
 +EOF
 +test_expect_success "merge conflicting with --union" \
 +      "git merge-file --union test.txt orig.txt new3.txt && test_cmp test.txt expect.txt"
 +cp backup.txt test.txt
 +
  test_expect_success "merge with conflicts, using -L" \
        "test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt"
  
@@@ -326,23 -261,4 +327,23 @@@ test_expect_success 'marker size' 
        test_cmp expect actual
  '
  
 +printf "line1\nline2\nline3" >nolf-orig.txt
 +printf "line1\nline2\nline3x" >nolf-diff1.txt
 +printf "line1\nline2\nline3y" >nolf-diff2.txt
 +
 +test_expect_success 'conflict at EOF without LF resolved by --ours' \
 +      'git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
 +       printf "line1\nline2\nline3x" >expect.txt &&
 +       test_cmp expect.txt output.txt'
 +
 +test_expect_success 'conflict at EOF without LF resolved by --theirs' \
 +      'git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
 +       printf "line1\nline2\nline3y" >expect.txt &&
 +       test_cmp expect.txt output.txt'
 +
 +test_expect_success 'conflict at EOF without LF resolved by --union' \
 +      'git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
 +       printf "line1\nline2\nline3x\nline3y" >expect.txt &&
 +       test_cmp expect.txt output.txt'
 +
  test_done