Make git-pack-objects a builtin

diff --git a/builtin-diff.c b/builtin-diff.c
index ec27542d484b8a1d69d1ea5a57ba795f5a78b35c..1075855102fdb9d49f923edc4b62ddb75aa8027c 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -23,7 +23,7 @@ struct blobinfo {
 };
 
 static const char builtin_diff_usage[] =
-"diff <options> <rev>{0,2} -- <path>*";
+"git-diff <options> <rev>{0,2} -- <path>*";
 
 static int builtin_diff_files(struct rev_info *revs,
                              int argc, const char **argv)
@@ -133,7 +133,7 @@ static int builtin_diff_blobs(struct rev_info *revs,
        stuff_change(&revs->diffopt,
                     mode, mode,
                     blob[0].sha1, blob[1].sha1,
-                    blob[0].name, blob[0].name);
+                    blob[0].name, blob[1].name);
        diffcore_std(&revs->diffopt);
        diff_flush(&revs->diffopt);
        return 0;