Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 3/7] t5528-push-default.sh: add helper functions

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:39
Subsystem: the rest · Maintainer: Linus Torvalds

Possibly related (same subject, not in this thread)

Junio C Hamano [off-list ref] writes:
Matthieu Moy [off-list ref] writes:
quoted
quoted
... and we can use --all not master here, right?
Actually, we can even use --all everywhere. And then, we don't even need
the second argument, and we can simplify greatly the function:
That did cross my mind but I suspected that the reason to have the
argument was because you would want to use the helper also to test
'matching' case where you want to make sure ones that the pusher does
not have are left alone.
In any case, here is the summary of my comments in patch form (I am not
squashing them myself).

-- >8 --
Subject: [PATCH 1/3] fixup! push: introduce new push.default mode "simple"

compilation fix; this should be static and needs type.

Signed-off-by: Junio C Hamano <redacted>
---
 builtin/push.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/push.c b/builtin/push.c
index 7a845a8..913ac7a 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -76,7 +76,7 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)
 	return remote->url_nr;
 }
 
-NORETURN die_push_simple(struct branch *branch, struct remote *remote) {
+static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) {
 	/*
 	 * There's no point in using shorten_unambiguous_ref here,
 	 * as the ambiguity would be on the remote side, not what
-- 
1.7.10.376.g4eb25
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help