[PATCH] Support commit_format in diff-tree

diff --git a/local-pull.c b/local-pull.c
index 3a342ab18390d7ce0df1f970a4961b31548a9417..8bfe67b4071b6445210a06e51b0d5f1c5b1ba113 100644 (file)
--- a/local-pull.c
+++ b/local-pull.c
@@ -1,15 +1,8 @@
 /*
  * Copyright (C) 2005 Junio C Hamano
  */
-#include <fcntl.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
 #include "cache.h"
 #include "commit.h"
-#include <errno.h>
-#include <stdio.h>
 #include "pull.h"
 
 static int use_link = 0;
@@ -80,8 +73,13 @@ int fetch(unsigned char *sha1)
        return -1;
 }
 
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+       return -1;
+}
+
 static const char *local_pull_usage = 
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -99,6 +97,10 @@ int main(int argc, char **argv)
                        get_tree = 1;
                else if (argv[arg][1] == 'c')
                        get_history = 1;
+               else if (argv[arg][1] == 'd')
+                       get_delta = 0;
+               else if (!strcmp(argv[arg], "--recover"))
+                       get_delta = 2;
                else if (argv[arg][1] == 'a') {
                        get_all = 1;
                        get_tree = 1;