projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add git-annotate(1) and git-blame(1)
[git.git]
/
http-push.c
diff --git
a/http-push.c
b/http-push.c
index
b60fa8d
..
114d01b
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
@@
-1211,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)
@@
-1240,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);
@@
-2350,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);
}