Git merge-file doesn't account correctly for not being in repo root
- From
- Aleksander Boruch-Gruszecki <aleksander.boruch-gruszecki@bright-it.com>
- Date
- Nov 14, 2014, 17:06 UTC
- Message-ID
- <CAOiM-0UinUshK83MHbTcTj1VwrN1b-NnAv9NJYkphckZLiSXug@mail.gmail.com>
Git merge-file works correctly when reading files, but when trying to write to them, it doesn't prepend current working directory. I've attached a basic example - running "git merge-file file1 file file2" from inside sample dir will "fail" silently and write to file1 in repo root. Running git merge-file from the same dir referencing files inside deeper-sample will fail with message "error: Could not open deeper-sample/file1 for writing".