Felipe Contreras wrote:
@@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char
*name_buf, int len)
*/
if (!branch)
die(_(HEAD does not point to a branch));
- if (!branch-merge || !branch-merge[0]-dst) {
- if
Felipe Contreras wrote:
diff --git a/sha1_name.c b/sha1_name.c
index aa3f3e0..a36852d 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -415,9 +415,9 @@ static int ambiguous_path(const char *path, int len)
return slash;
}
-static inline int upstream_mark(const char *string, int len)
Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
@@ -1068,23 +1069,35 @@ static const char *get_upstream_branch(const char
*name_buf, int len)
*/
if (!branch)
die(_(HEAD does not point to a branch));
- if (!branch-merge ||
Ramkumar Ramachandra wrote:
Felipe Contreras wrote:
diff --git a/sha1_name.c b/sha1_name.c
index aa3f3e0..a36852d 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -415,9 +415,9 @@ static int ambiguous_path(const char *path, int len)
return slash;
}
-static inline int
4 matches
Mail list logo