projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Documentation: describe diff tweaking.
[git.git]
/
local-pull.c
diff --git
a/local-pull.c
b/local-pull.c
index
acfcbb6
..
afdba9f
100644
(file)
--- a/
local-pull.c
+++ b/
local-pull.c
@@
-1,15
+1,8
@@
/*
* Copyright (C) 2005 Junio C Hamano
*/
/*
* 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 "cache.h"
#include "commit.h"
-#include <errno.h>
-#include <stdio.h>
#include "pull.h"
static int use_link = 0;
#include "pull.h"
static int use_link = 0;
@@
-71,8
+64,7
@@
int fetch(unsigned char *sha1)
munmap(map, st.st_size);
close(ofd);
if (status)
munmap(map, st.st_size);
close(ofd);
if (status)
- fprintf(stderr, "cannot write %s (%ld bytes)\n",
- dest_filename, st.st_size);
+ fprintf(stderr, "cannot write %s\n", dest_filename);
else
pull_say("copy %s\n", hex);
return status;
else
pull_say("copy %s\n", hex);
return status;
@@
-82,7
+74,7
@@
int fetch(unsigned char *sha1)
}
static const char *local_pull_usage =
}
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.
/*
* By default we only use file copy.
@@
-100,6
+92,10
@@
int main(int argc, char **argv)
get_tree = 1;
else if (argv[arg][1] == 'c')
get_history = 1;
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;
else if (argv[arg][1] == 'a') {
get_all = 1;
get_tree = 1;