projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make "tree_entry" have a SHA1 instead of a union of object pointers
[git.git]
/
http-push.c
diff --git
a/http-push.c
b/http-push.c
index
21c5289
..
f492a5d
100644
(file)
--- a/
http-push.c
+++ b/
http-push.c
@@
-6,6
+6,7
@@
#include "blob.h"
#include "http.h"
#include "refs.h"
#include "blob.h"
#include "http.h"
#include "refs.h"
+#include "diff.h"
#include "revision.h"
#include "exec_cmd.h"
#include "revision.h"
#include "exec_cmd.h"
@@
-59,12
+60,12
@@
enum XML_Status {
#define LOCK_TIME 600
#define LOCK_REFRESH 30
#define LOCK_TIME 600
#define LOCK_REFRESH 30
-/* bits #0-
4
in revision.h */
+/* bits #0-
15
in revision.h */
-#define LOCAL (1u
<< 5
)
-#define REMOTE (1u
<< 6
)
-#define FETCHING (1u
<< 7
)
-#define PUSHING (1u
<< 8
)
+#define LOCAL (1u
<<16
)
+#define REMOTE (1u
<<17
)
+#define FETCHING (1u
<<18
)
+#define PUSHING (1u
<<19
)
/* We allow "recursive" symbolic refs. Only within reason, though */
#define MAXDEPTH 5
/* We allow "recursive" symbolic refs. Only within reason, though */
#define MAXDEPTH 5
@@
-622,7
+623,7
@@
static int refresh_lock(struct remote_lock *lock)
return rc;
}
return rc;
}
-static void check_locks()
+static void check_locks(
void
)
{
struct remote_lock *lock = remote->locks;
time_t current_time = time(NULL);
{
struct remote_lock *lock = remote->locks;
time_t current_time = time(NULL);
@@
-1008,8
+1009,7
@@
static int fetch_indices(void)
struct active_request_slot *slot;
struct slot_results results;
struct active_request_slot *slot;
struct slot_results results;
- data = xmalloc(4096);
- memset(data, 0, 4096);
+ data = xcalloc(1, 4096);
buffer.size = 4096;
buffer.posn = 0;
buffer.buffer = data;
buffer.size = 4096;
buffer.posn = 0;
buffer.buffer = data;
@@
-1212,7
+1212,7
@@
static void
xml_start_tag(void *userData, const char *name, const char **atts)
{
struct xml_ctx *ctx = (struct xml_ctx *)userData;
xml_start_tag(void *userData, const char *name, const char **atts)
{
struct xml_ctx *ctx = (struct xml_ctx *)userData;
- const char *c =
index
(name, ':');
+ const char *c =
strchr
(name, ':');
int new_len;
if (c == NULL)
int new_len;
if (c == NULL)
@@
-1241,7
+1241,7
@@
static void
xml_end_tag(void *userData, const char *name)
{
struct xml_ctx *ctx = (struct xml_ctx *)userData;
xml_end_tag(void *userData, const char *name)
{
struct xml_ctx *ctx = (struct xml_ctx *)userData;
- const char *c =
index
(name, ':');
+ const char *c =
strchr
(name, ':');
char *ep;
ctx->userFunc(ctx, 1);
char *ep;
ctx->userFunc(ctx, 1);
@@
-1733,9
+1733,9
@@
static struct object_list **process_tree(struct tree *tree,
while (entry) {
struct tree_entry_list *next = entry->next;
if (entry->directory)
while (entry) {
struct tree_entry_list *next = entry->next;
if (entry->directory)
- p = process_tree(
entry->item.tree
, p, &me, entry->name);
+ p = process_tree(
lookup_tree(entry->sha1)
, p, &me, entry->name);
else
else
- p = process_blob(
entry->item.blob
, p, &me, entry->name);
+ p = process_blob(
lookup_blob(entry->sha1)
, p, &me, entry->name);
free(entry);
entry = next;
}
free(entry);
entry = next;
}
@@
-2042,8
+2042,7
@@
static void update_remote_info_refs(struct remote_lock *lock)
char *if_header;
struct curl_slist *dav_headers = NULL;
char *if_header;
struct curl_slist *dav_headers = NULL;
- buffer.buffer = xmalloc(4096);
- memset(buffer.buffer, 0, 4096);
+ buffer.buffer = xcalloc(1, 4096);
buffer.size = 4096;
buffer.posn = 0;
remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
buffer.size = 4096;
buffer.posn = 0;
remote_ls("refs/", (PROCESS_FILES | RECURSIVE),
@@
-2352,7
+2351,7
@@
int main(int argc, char **argv)
char *path = strstr(arg, "//");
remote->url = arg;
if (path) {
char *path = strstr(arg, "//");
remote->url = arg;
if (path) {
- path =
index
(path+2, '/');
+ path =
strchr
(path+2, '/');
if (path)
remote->path_len = strlen(path);
}
if (path)
remote->path_len = strlen(path);
}
@@
-2499,6
+2498,7
@@
int main(int argc, char **argv)
commit_argv[3] = old_sha1_hex;
commit_argc++;
}
commit_argv[3] = old_sha1_hex;
commit_argc++;
}
+ init_revisions(&revs);
setup_revisions(commit_argc, commit_argv, &revs, NULL);
free(new_sha1_hex);
if (old_sha1_hex) {
setup_revisions(commit_argc, commit_argv, &revs, NULL);
free(new_sha1_hex);
if (old_sha1_hex) {