projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up trivially redundant diff.
[git.git]
/
fetch-pack.c
diff --git
a/fetch-pack.c
b/fetch-pack.c
index
aa6f42a
..
a3bcad0
100644
(file)
--- a/
fetch-pack.c
+++ b/
fetch-pack.c
@@
-7,8
+7,9
@@
static int keep_pack;
static int quiet;
static int verbose;
static int keep_pack;
static int quiet;
static int verbose;
+static int fetch_all;
static const char fetch_pack_usage[] =
static const char fetch_pack_usage[] =
-"git-fetch-pack [-
q] [-v] [-k
] [--exec=upload-pack] [host:]directory <refs>...";
+"git-fetch-pack [-
-all] [-q] [-v] [-k] [--thin
] [--exec=upload-pack] [host:]directory <refs>...";
static const char *exec = "git-upload-pack";
#define COMPLETE (1U << 0)
static const char *exec = "git-upload-pack";
#define COMPLETE (1U << 0)
@@
-18,7
+19,7
@@
static const char *exec = "git-upload-pack";
#define POPPED (1U << 4)
static struct commit_list *rev_list = NULL;
#define POPPED (1U << 4)
static struct commit_list *rev_list = NULL;
-static int non_common_revs = 0, multi_ack = 0;
+static int non_common_revs = 0, multi_ack = 0
, use_thin_pack = 0
;
static void rev_list_push(struct commit *commit, int mark)
{
static void rev_list_push(struct commit *commit, int mark)
{
@@
-82,7
+83,7
@@
static void mark_common(struct commit *commit,
Get the next rev to send, ignoring the common.
*/
Get the next rev to send, ignoring the common.
*/
-static const unsigned char* get_rev()
+static const unsigned char* get_rev(
void
)
{
struct commit *commit = NULL;
{
struct commit *commit = NULL;
@@
-156,8
+157,9
@@
static int find_common(int fd[2], unsigned char *result_sha1,
continue;
}
continue;
}
- packet_write(fd[1], "want %s%s\n", sha1_to_hex(remote),
- multi_ack ? " multi_ack" : "");
+ packet_write(fd[1], "want %s%s%s\n", sha1_to_hex(remote),
+ (multi_ack ? " multi_ack" : ""),
+ (use_thin_pack ? " thin-pack" : ""));
fetching++;
}
packet_flush(fd[1]);
fetching++;
}
packet_flush(fd[1]);
@@
-265,8
+267,9
@@
static void filter_refs(struct ref **refs, int nr_match, char **match)
for (prev = NULL, current = *refs; current; current = next) {
next = current->next;
if ((!memcmp(current->name, "refs/", 5) &&
for (prev = NULL, current = *refs; current; current = next) {
next = current->next;
if ((!memcmp(current->name, "refs/", 5) &&
- check_ref_format(current->name + 5)) ||
- !path_match(current->name, nr_match, match)) {
+ check_ref_format(current->name + 5)) ||
+ (!fetch_all &&
+ !path_match(current->name, nr_match, match))) {
if (prev == NULL)
*refs = next;
else
if (prev == NULL)
*refs = next;
else
@@
-375,7
+378,11
@@
static int fetch_pack(int fd[2], int nr_match, char **match)
goto all_done;
}
if (find_common(fd, sha1, ref) < 0)
goto all_done;
}
if (find_common(fd, sha1, ref) < 0)
- fprintf(stderr, "warning: no common commits\n");
+ if (!keep_pack)
+ /* When cloning, it is not unusual to have
+ * no common commit.
+ */
+ fprintf(stderr, "warning: no common commits\n");
if (keep_pack)
status = receive_keep_pack(fd, "git-fetch-pack", quiet);
if (keep_pack)
status = receive_keep_pack(fd, "git-fetch-pack", quiet);
@@
-421,6
+428,14
@@
int main(int argc, char **argv)
keep_pack = 1;
continue;
}
keep_pack = 1;
continue;
}
+ if (!strcmp("--thin", arg)) {
+ use_thin_pack = 1;
+ continue;
+ }
+ if (!strcmp("--all", arg)) {
+ fetch_all = 1;
+ continue;
+ }
if (!strcmp("-v", arg)) {
verbose = 1;
continue;
if (!strcmp("-v", arg)) {
verbose = 1;
continue;
@@
-434,6
+449,8
@@
int main(int argc, char **argv)
}
if (!dest)
usage(fetch_pack_usage);
}
if (!dest)
usage(fetch_pack_usage);
+ if (keep_pack)
+ use_thin_pack = 0;
pid = git_connect(fd, dest, exec);
if (pid < 0)
return 1;
pid = git_connect(fd, dest, exec);
if (pid < 0)
return 1;