daemon.c: remove trailing whitespace.

diff --git a/rev-list.c b/rev-list.c
index 523fda07e1eef4b3a1a801abbf94358d06af17fd..c60aa72957cb65501266911aefd8aaaa2f2e4e16 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "refs.h"
 #include "tag.h"
 #include "commit.h"
 #include "tree.h"
@@ -194,7 +195,17 @@ static void show_commit_list(struct commit_list *list)
                die("unknown pending object %s (%s)", sha1_to_hex(obj->sha1), name);
        }
        while (objects) {
-               printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
+               /* An object with name "foo\n0000000000000000000000000000000000000000"
+                * can be used confuse downstream git-pack-objects very badly.
+                */
+               const char *ep = strchr(objects->name, '\n');
+               if (ep) {
+                       printf("%s %.*s\n", sha1_to_hex(objects->item->sha1),
+                              (int) (ep - objects->name),
+                              objects->name);
+               }
+               else
+                       printf("%s %s\n", sha1_to_hex(objects->item->sha1), objects->name);
                objects = objects->next;
        }
 }
@@ -479,6 +490,22 @@ static void handle_one_commit(struct commit *com, struct commit_list **lst)
        commit_list_insert(com, lst);
 }
 
+/* for_each_ref() callback does not allow user data -- Yuck. */
+static struct commit_list **global_lst;
+
+static int include_one_commit(const char *path, const unsigned char *sha1)
+{
+       struct commit *com = get_commit_reference(path, 0);
+       handle_one_commit(com, global_lst);
+       return 0;
+}
+
+static void handle_all(struct commit_list **lst)
+{
+       global_lst = lst;
+       for_each_ref(include_one_commit);
+       global_lst = NULL;
+}
 
 int main(int argc, char **argv)
 {
@@ -532,6 +559,10 @@ int main(int argc, char **argv)
                        bisect_list = 1;
                        continue;
                }
+               if (!strcmp(arg, "--all")) {
+                       handle_all(&list);
+                       continue;
+               }
                if (!strcmp(arg, "--objects")) {
                        tag_objects = 1;
                        tree_objects = 1;