diff --git a/receive-pack.c b/receive-pack.c
index 7ce5f1e24a57f673e614c6bb3d75480e272d37da..dfa7cd1d0a81eade8225e11dc0f2b97682a905c0 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
#include "cache.h"
+#include "refs.h"
#include "pkt-line.h"
#include <sys/wait.h>
-static const char receive_pack_usage[] = "git-receive-pack [--unpack=executable] <git-dir> [heads]";
+static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
static const char *unpacker = "git-unpack-objects";
-static int path_match(const char *path, int nr, char **match)
-{
- int i;
- int pathlen = strlen(path);
-
- for (i = 0; i < nr; i++) {
- char *s = match[i];
- int len = strlen(s);
-
- if (!len || len > pathlen)
- continue;
- if (memcmp(path + pathlen - len, s, len))
- continue;
- if (pathlen > len && path[pathlen - len - 1] != '/')
- continue;
- *s = 0;
- return 1;
- }
- return 0;
-}
-
-static void show_ref(const char *path, unsigned char *sha1)
+static int show_ref(const char *path, const unsigned char *sha1)
{
packet_write(1, "%s %s\n", sha1_to_hex(sha1), path);
+ return 0;
}
-static int read_ref(const char *path, unsigned char *sha1)
-{
- int ret = -1;
- int fd = open(path, O_RDONLY);
-
- if (fd >= 0) {
- char buffer[60];
- if (read(fd, buffer, sizeof(buffer)) >= 40)
- ret = get_sha1_hex(buffer, sha1);
- close(fd);
- }
- return ret;
-}
-
-static void write_head_info(const char *base, int nr, char **match)
+static void write_head_info(void)
{
- DIR *dir = opendir(base);
-
- if (dir) {
- struct dirent *de;
- int baselen = strlen(base);
- char *path = xmalloc(baselen + 257);
- memcpy(path, base, baselen);
-
- while ((de = readdir(dir)) != NULL) {
- char sha1[20];
- struct stat st;
- int namelen;
-
- if (de->d_name[0] == '.')
- continue;
- namelen = strlen(de->d_name);
- if (namelen > 255)
- continue;
- memcpy(path + baselen, de->d_name, namelen+1);
- if (lstat(path, &st) < 0)
- continue;
- if (S_ISDIR(st.st_mode)) {
- path[baselen + namelen] = '/';
- path[baselen + namelen + 1] = 0;
- write_head_info(path, nr, match);
- continue;
- }
- if (read_ref(path, sha1) < 0)
- continue;
- if (!has_sha1_file(sha1))
- continue;
- if (nr && !path_match(path, nr, match))
- continue;
- show_ref(path, sha1);
- }
- free(path);
- closedir(dir);
- }
+ for_each_ref(show_ref);
}
struct command {
char ref_name[0];
};
-struct command *commands = NULL;
+static struct command *commands = NULL;
+
+static int is_all_zeroes(const char *hex)
+{
+ int i;
+ for (i = 0; i < 40; i++)
+ if (*hex++ != '0')
+ return 0;
+ return 1;
+}
static int verify_old_ref(const char *name, char *hex_contents)
{
int fd, ret;
char buffer[60];
+ if (is_all_zeroes(hex_contents))
+ return 0;
fd = open(name, O_RDONLY);
if (fd < 0)
return -1;
memcpy(lock_name + namelen, ".lock", 6);
strcpy(new_hex, sha1_to_hex(new_sha1));
- new_hex[40] = '\n';
- new_hex[41] = 0;
old_hex = sha1_to_hex(old_sha1);
if (!has_sha1_file(new_sha1))
die("unpack should have generated %s, but I can't find it!", new_hex);
@@ -134,7 +73,14 @@ static void update(const char *name, unsigned char *old_sha1, unsigned char *new
newfd = open(lock_name, O_CREAT | O_EXCL | O_WRONLY, 0644);
if (newfd < 0)
die("unable to create %s (%s)", lock_name, strerror(errno));
+
+ /* Write the ref with an ending '\n' */
+ new_hex[40] = '\n';
+ new_hex[41] = 0;
written = write(newfd, new_hex, 41);
+ /* Remove the '\n' again */
+ new_hex[40] = 0;
+
close(newfd);
if (written != 41) {
unlink(lock_name);
int main(int argc, char **argv)
{
- int i, nr_heads = 0;
+ int i;
const char *dir = NULL;
- char **heads = NULL;
argv++;
for (i = 1; i < argc; i++) {
const char *arg = *argv++;
if (*arg == '-') {
- if (!strncmp(arg, "--unpack=", 9)) {
- unpacker = arg+9;
- continue;
- }
/* Do flag handling here */
usage(receive_pack_usage);
}
+ if (dir)
+ usage(receive_pack_usage);
dir = arg;
- heads = argv;
- nr_heads = argc - i - 1;
- break;
}
if (!dir)
usage(receive_pack_usage);
if (access("objects", X_OK) < 0 || access("refs/heads", X_OK) < 0)
die("%s doesn't appear to be a git directory", dir);
- write_head_info("refs/", nr_heads, heads);
+ write_head_info();
/* EOF */
packet_flush(1);