mirror of
https://github.com/git/git.git
synced 2024-11-14 13:13:01 +01:00
c5546e88fe
When creating a bundle, symbolic refs used to be resolved to the non-symbolic refs they point to before being written to the list of contained refs. I.e. "git bundle create a1.bundle HEAD master" would show something like 388afe7881b33102fada216dd07806728773c011 refs/heads/master 388afe7881b33102fada216dd07806728773c011 refs/heads/master instead of 388afe7881b33102fada216dd07806728773c011 HEAD 388afe7881b33102fada216dd07806728773c011 refs/heads/master Introduce a special handling so that the symbolic refs are listed with the names passed on the command line. Noticed by Santi Béjar. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
#include "builtin.h"
|
|
#include "cache.h"
|
|
#include "bundle.h"
|
|
|
|
/*
|
|
* Basic handler for bundle files to connect repositories via sneakernet.
|
|
* Invocation must include action.
|
|
* This function can create a bundle or provide information on an existing
|
|
* bundle supporting git-fetch, git-pull, and git-ls-remote
|
|
*/
|
|
|
|
static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args> | verify <bundle> | list-heads <bundle> [refname]... | unbundle <bundle> [refname]... )";
|
|
|
|
int cmd_bundle(int argc, const char **argv, const char *prefix)
|
|
{
|
|
struct bundle_header header;
|
|
int nongit = 0;
|
|
const char *cmd, *bundle_file;
|
|
int bundle_fd = -1;
|
|
char buffer[PATH_MAX];
|
|
|
|
if (argc < 3)
|
|
usage(bundle_usage);
|
|
|
|
cmd = argv[1];
|
|
bundle_file = argv[2];
|
|
argc -= 2;
|
|
argv += 2;
|
|
|
|
prefix = setup_git_directory_gently(&nongit);
|
|
if (prefix && bundle_file[0] != '/') {
|
|
snprintf(buffer, sizeof(buffer), "%s/%s", prefix, bundle_file);
|
|
bundle_file = buffer;
|
|
}
|
|
|
|
memset(&header, 0, sizeof(header));
|
|
if (strcmp(cmd, "create") && (bundle_fd =
|
|
read_bundle_header(bundle_file, &header)) < 0)
|
|
return 1;
|
|
|
|
if (!strcmp(cmd, "verify")) {
|
|
close(bundle_fd);
|
|
if (verify_bundle(&header, 1))
|
|
return 1;
|
|
fprintf(stderr, "%s is okay\n", bundle_file);
|
|
return 0;
|
|
}
|
|
if (!strcmp(cmd, "list-heads")) {
|
|
close(bundle_fd);
|
|
return !!list_bundle_refs(&header, argc, argv);
|
|
}
|
|
if (!strcmp(cmd, "create")) {
|
|
if (nongit)
|
|
die("Need a repository to create a bundle.");
|
|
return !!create_bundle(&header, bundle_file, argc, argv);
|
|
} else if (!strcmp(cmd, "unbundle")) {
|
|
if (nongit)
|
|
die("Need a repository to unbundle.");
|
|
return !!unbundle(&header, bundle_fd) ||
|
|
list_bundle_refs(&header, argc, argv);
|
|
} else
|
|
usage(bundle_usage);
|
|
}
|