Changes 'git diff --no-index $directory $file' behaviour.
Now it is transformed to 'git diff --no-index $directory/&file $file'
instead of throwing an error.
Signed-off-by: Yurii Shevtsov <ungetch <at> gmail.com>
---
diff-no-index.c | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c
index 265709b..4e71b36 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -97,8 +97,25 @@ static int queue_diff(struct diff_options *o,
if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
return -1;
- if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2))
- return error("file/directory conflict: %s, %s", name1, name2);
+ if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
+ struct strbuf dirnfile;
+ const char *dir, *file;
+ char *filename;
+ int ret = 0;
+
+ dir = S_ISDIR(mode1) ? name1 : name2;
+ file = (dir == name1) ? name2 : name1;
+ strbuf_init(&dirnfile, strlen(name1) + strlen(name2) + 2);
+ strbuf_addstr(&dirnfile, dir);
+ if (dirnfile.buf[dirnfile.len - 1] != '/')
+ strbuf_addch(&dirnfile, '/');
+ filename = strrchr(file, '/');
+ strbuf_addstr(&dirnfile, filename ? (filename + 1) : file);
+ ret = queue_diff(o, dirnfile.buf, file);
+ strbuf_release(&dirnfile);
+
+ return ret;
+ }
if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
struct strbuf buffer1 = STRBUF_INIT;
--
I hope I understood task correct. I think this patch requires writing
additional tests, so that's what I'm going to do now.
--
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 http://vger.kernel.org/majordomo-info.html
