Merge branch 'master' into js/diff-ni

diff --git a/builtin-diff.c b/builtin-diff.c
index 45faa2067a7f15286216c0323de0bf0ed5ef0f4c..28b660a780f9f2ae48acf5e8d3dc7c7aee178de2 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -162,7 +162,8 @@ static int builtin_diff_combined(struct rev_info *revs,
        parent = xmalloc(ents * sizeof(*parent));
        /* Again, the revs are all reverse */
        for (i = 0; i < ents; i++)
-               hashcpy((unsigned char*)parent + i, ent[ents - 1 - i].item->sha1);
+               hashcpy((unsigned char *)(parent + i),
+                       ent[ents - 1 - i].item->sha1);
        diff_tree_combined(parent[0], parent + 1, ents - 1,
                           revs->dense_combined_merges, revs);
        return 0;
@@ -232,6 +233,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
                                break;
                        else if (!strcmp(arg, "--cached")) {
                                add_head(&rev);
+                               if (!rev.pending.nr)
+                                       die("No HEAD commit to compare with (yet)");
                                break;
                        }
                }