* [PATCH] midx.c: mark a file-local symbol as static
@ 2018-09-14 23:26 Ramsay Jones
2018-09-17 20:11 ` Derrick Stolee
0 siblings, 1 reply; 4+ messages in thread
From: Ramsay Jones @ 2018-09-14 23:26 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Junio C Hamano, GIT Mailing-list
Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---
Hi Derrick,
If you need to re-roll your 'ds/multi-pack-verify' branch, could you
please squash this into the relevant patch (commit 64cbf3df21,
"multi-pack-index: add 'verify' verb", 2018-09-13).
[noticed by sparse].
Thanks.
ATB,
Ramsay Jones
midx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/midx.c b/midx.c
index 4d4c930522..713d6f9dde 100644
--- a/midx.c
+++ b/midx.c
@@ -926,7 +926,7 @@ void clear_midx_file(const char *object_dir)
free(midx);
}
-int verify_midx_error;
+static int verify_midx_error;
static void midx_report(const char *fmt, ...)
{
--
2.19.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] midx.c: mark a file-local symbol as static
2018-09-14 23:26 [PATCH] midx.c: mark a file-local symbol as static Ramsay Jones
@ 2018-09-17 20:11 ` Derrick Stolee
2018-09-17 20:44 ` Junio C Hamano
2018-09-17 20:47 ` Junio C Hamano
0 siblings, 2 replies; 4+ messages in thread
From: Derrick Stolee @ 2018-09-17 20:11 UTC (permalink / raw)
To: Ramsay Jones, Derrick Stolee; +Cc: Junio C Hamano, GIT Mailing-list
On 9/14/2018 7:26 PM, Ramsay Jones wrote:
> Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
> ---
>
> Hi Derrick,
>
> If you need to re-roll your 'ds/multi-pack-verify' branch, could you
> please squash this into the relevant patch (commit 64cbf3df21,
> "multi-pack-index: add 'verify' verb", 2018-09-13).
>
> [noticed by sparse].
>
> Thanks.
>
> ATB,
> Ramsay Jones
Thanks for catching this, Ramsay. Sorry for the mistake.
ds/multi-pack-verify is currently queued for 'next', so I wasn't
planning on sending another version.
Junio, could you add this commit to the tip, or squash it into 64cbf3df2
"multi-pack-index: add 'verify' verb"?
Thanks,
-Stolee
>
> midx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/midx.c b/midx.c
> index 4d4c930522..713d6f9dde 100644
> --- a/midx.c
> +++ b/midx.c
> @@ -926,7 +926,7 @@ void clear_midx_file(const char *object_dir)
> free(midx);
> }
>
> -int verify_midx_error;
> +static int verify_midx_error;
>
> static void midx_report(const char *fmt, ...)
> {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] midx.c: mark a file-local symbol as static
2018-09-17 20:11 ` Derrick Stolee
@ 2018-09-17 20:44 ` Junio C Hamano
2018-09-17 20:47 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2018-09-17 20:44 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Ramsay Jones, Derrick Stolee, GIT Mailing-list
Derrick Stolee <stolee@gmail.com> writes:
> ds/multi-pack-verify is currently queued for 'next', so I wasn't
> planning on sending another version.
>
> Junio, could you add this commit to the tip, or squash it into
> 64cbf3df2 "multi-pack-index: add 'verify' verb"?
I think it makes sense to queue this on top. Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] midx.c: mark a file-local symbol as static
2018-09-17 20:11 ` Derrick Stolee
2018-09-17 20:44 ` Junio C Hamano
@ 2018-09-17 20:47 ` Junio C Hamano
1 sibling, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2018-09-17 20:47 UTC (permalink / raw)
To: Derrick Stolee; +Cc: Ramsay Jones, Derrick Stolee, GIT Mailing-list
Derrick Stolee <stolee@gmail.com> writes:
> Thanks for catching this, Ramsay. Sorry for the mistake.
>
> ds/multi-pack-verify is currently queued for 'next', so I wasn't
> planning on sending another version.
Marked for 'next' does not mean we cannot touch it. It merely means
"so far no issue that requires a reroll has been raised afaik", and
the whole point of marking it is to give people a chance to stop it
before getting merged to 'next' with known issues.
As the problematic commit is not in 'next', let's squash the fix in.
Thanks, both.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-17 20:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-14 23:26 [PATCH] midx.c: mark a file-local symbol as static Ramsay Jones
2018-09-17 20:11 ` Derrick Stolee
2018-09-17 20:44 ` Junio C Hamano
2018-09-17 20:47 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).