Re: [PATCH v2] merge-file: correctly open files when in a subdir

Here is what I have right now, queued somewhere in 'pu', after fixing it up a bit. That's awesome! Thanks for your help :) -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at

Re: [PATCH v2] merge-file: correctly open files when in a subdir

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

[PATCH v2] merge-file: correctly open files when in a subdir

working directory perspective. Signed-off-by: Aleksander Boruch-Gruszecki aleksander.boruchgrusze...@gmail.com --- builtin/merge-file.c | 3 ++- t/t6023-merge-file.sh | 6 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/merge-file.c b/builtin/merge-file.c index 844f84f

[PATCH] merge-file: correctly open files when in a subdir

working directory perspective. Signed-off-by: Aleksander Boruch-Gruszecki aleksander.boruchgrusze...@gmail.com --- I'm sorry if I'm sending the copies to wrong people, but I had no idea who to send them to since there were barely any changes to the file. Since the fix is so trivial I didn't add any

Git merge-file doesn't account correctly for not being in repo root

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