mirror of
https://github.com/git/git.git
synced 2024-11-26 11:34:00 +08:00
Build-in peek-remote, using transport infrastructure.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
4577370e9b
commit
18f7c51cf9
3
Makefile
3
Makefile
@ -239,7 +239,7 @@ PROGRAMS = \
|
||||
git-fast-import$X \
|
||||
git-daemon$X \
|
||||
git-merge-index$X git-mktag$X git-mktree$X git-patch-id$X \
|
||||
git-peek-remote$X git-receive-pack$X \
|
||||
git-receive-pack$X \
|
||||
git-send-pack$X git-shell$X \
|
||||
git-show-index$X \
|
||||
git-unpack-file$X \
|
||||
@ -352,6 +352,7 @@ BUILTIN_OBJS = \
|
||||
builtin-mv.o \
|
||||
builtin-name-rev.o \
|
||||
builtin-pack-objects.o \
|
||||
builtin-peek-remote.o \
|
||||
builtin-prune.o \
|
||||
builtin-prune-packed.o \
|
||||
builtin-push.o \
|
||||
|
@ -1,38 +1,26 @@
|
||||
#include "builtin.h"
|
||||
#include "cache.h"
|
||||
#include "refs.h"
|
||||
#include "pkt-line.h"
|
||||
#include "transport.h"
|
||||
#include "remote.h"
|
||||
|
||||
static const char peek_remote_usage[] =
|
||||
"git-peek-remote [--upload-pack=<git-upload-pack>] [<host>:]<directory>";
|
||||
static const char *uploadpack = "git-upload-pack";
|
||||
|
||||
static int peek_remote(int fd[2], unsigned flags)
|
||||
int cmd_peek_remote(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
struct ref *ref;
|
||||
|
||||
get_remote_heads(fd[0], &ref, 0, NULL, flags);
|
||||
packet_flush(fd[1]);
|
||||
|
||||
while (ref) {
|
||||
printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name);
|
||||
ref = ref->next;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i, ret;
|
||||
char *dest = NULL;
|
||||
int fd[2];
|
||||
struct child_process *conn;
|
||||
int i;
|
||||
const char *dest = NULL;
|
||||
int nongit = 0;
|
||||
unsigned flags = 0;
|
||||
const char *uploadpack = NULL;
|
||||
|
||||
struct transport *transport;
|
||||
const struct ref *ref;
|
||||
|
||||
setup_git_directory_gently(&nongit);
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
char *arg = argv[i];
|
||||
const char *arg = argv[i];
|
||||
|
||||
if (*arg == '-') {
|
||||
if (!prefixcmp(arg, "--upload-pack=")) {
|
||||
@ -64,10 +52,19 @@ int main(int argc, char **argv)
|
||||
if (!dest || i != argc - 1)
|
||||
usage(peek_remote_usage);
|
||||
|
||||
conn = git_connect(fd, dest, uploadpack, 0);
|
||||
ret = peek_remote(fd, flags);
|
||||
close(fd[0]);
|
||||
close(fd[1]);
|
||||
ret |= finish_connect(conn);
|
||||
return !!ret;
|
||||
transport = transport_get(NULL, dest);
|
||||
if (uploadpack != NULL)
|
||||
transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
|
||||
|
||||
ref = transport_get_remote_refs(transport);
|
||||
|
||||
if (!ref)
|
||||
return 1;
|
||||
|
||||
while (ref) {
|
||||
if (check_ref_type(ref, flags))
|
||||
printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name);
|
||||
ref = ref->next;
|
||||
}
|
||||
return 0;
|
||||
}
|
@ -55,6 +55,7 @@ extern int cmd_merge_file(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_mv(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_name_rev(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_pack_objects(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_peek_remote(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_pickaxe(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_prune(int argc, const char **argv, const char *prefix);
|
||||
extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
|
||||
|
1
git.c
1
git.c
@ -333,6 +333,7 @@ static void handle_internal_command(int argc, const char **argv)
|
||||
{ "mv", cmd_mv, RUN_SETUP | NEED_WORK_TREE },
|
||||
{ "name-rev", cmd_name_rev, RUN_SETUP },
|
||||
{ "pack-objects", cmd_pack_objects, RUN_SETUP },
|
||||
{ "peek-remote", cmd_peek_remote },
|
||||
{ "pickaxe", cmd_blame, RUN_SETUP },
|
||||
{ "prune", cmd_prune, RUN_SETUP },
|
||||
{ "prune-packed", cmd_prune_packed, RUN_SETUP },
|
||||
|
Loading…
Reference in New Issue
Block a user