Separate the raw diff and patch with a newline

diff --git a/rev-list.c b/rev-list.c
index 22141e2b045bb4e54709ec16c83942fcfdd44ed2..359195b5471d8e4b88fd9a326986e55d48b1dfa6 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -7,9 +7,9 @@
 #include "tree-walk.h"
 #include "revision.h"
 
-/* bits #0-5 in revision.h */
+/* bits #0-6 in revision.h */
 
-#define COUNTED                (1u<<6)
+#define COUNTED                (1u<<7)
 
 static const char rev_list_usage[] =
 "git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -30,6 +30,7 @@ static const char rev_list_usage[] =
 "    --unpacked\n"
 "    --header | --pretty\n"
 "    --abbrev=nr | --no-abbrev\n"
+"    --abbrev-commit\n"
 "  special purpose:\n"
 "    --bisect"
 ;
@@ -39,6 +40,7 @@ struct rev_info revs;
 static int bisect_list = 0;
 static int verbose_header = 0;
 static int abbrev = DEFAULT_ABBREV;
+static int abbrev_commit = 0;
 static int show_timestamp = 0;
 static int hdr_termination = 0;
 static const char *commit_prefix = "";
@@ -52,7 +54,10 @@ static void show_commit(struct commit *commit)
                fputs(commit_prefix, stdout);
        if (commit->object.flags & BOUNDARY)
                putchar('-');
-       fputs(sha1_to_hex(commit->object.sha1), stdout);
+       if (abbrev_commit && abbrev)
+               fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
+       else
+               fputs(sha1_to_hex(commit->object.sha1), stdout);
        if (revs.parents) {
                struct commit_list *parents = commit->parents;
                while (parents) {
@@ -319,6 +324,14 @@ int main(int argc, const char **argv)
                        abbrev = 0;
                        continue;
                }
+               if (!strcmp(arg, "--abbrev")) {
+                       abbrev = DEFAULT_ABBREV;
+                       continue;
+               }
+               if (!strcmp(arg, "--abbrev-commit")) {
+                       abbrev_commit = 1;
+                       continue;
+               }
                if (!strncmp(arg, "--abbrev=", 9)) {
                        abbrev = strtoul(arg + 9, NULL, 10);
                        if (abbrev && abbrev < MINIMUM_ABBREV)