Disallow working directory commands in a bare repository.

diff --git a/diff.c b/diff.c
index 244292a70c5b8a86d23905036c4103d3d0c1df1c..e1b016f47f8eb37a89bdb6cb98435bad7d9dc111 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -2873,10 +2873,12 @@ void diff_change(struct diff_options *options,
 }
 
 void diff_unmerge(struct diff_options *options,
-                 const char *path)
+                 const char *path,
+                 unsigned mode, const unsigned char *sha1)
 {
        struct diff_filespec *one, *two;
        one = alloc_filespec(path);
        two = alloc_filespec(path);
-       diff_queue(&diff_queued_diff, one, two);
+       fill_filespec(one, sha1, mode);
+       diff_queue(&diff_queued_diff, one, two)->is_unmerged = 1;
 }