projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] git-diff-cache: handle pathspec beginning with a dash
[git.git]
/
local-pull.c
diff --git
a/local-pull.c
b/local-pull.c
index
e5d834f
..
8bfe67b
100644
(file)
--- a/
local-pull.c
+++ b/
local-pull.c
@@
-73,8
+73,13
@@
int fetch(unsigned char *sha1)
return -1;
}
return -1;
}
+int fetch_ref(char *ref, unsigned char *sha1)
+{
+ return -1;
+}
+
static const char *local_pull_usage =
static const char *local_pull_usage =
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] 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.
@@
-94,6
+99,8
@@
int main(int argc, char **argv)
get_history = 1;
else if (argv[arg][1] == 'd')
get_delta = 0;
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;