Re: [PATCH] midx.c: mark a file-local symbol as static

[Junio C Hamano]

Derrick Stolee  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.

Re: [PATCH] midx.c: mark a file-local symbol as static

[Junio C Hamano]

Derrick Stolee  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.

Re: [PATCH] midx.c: mark a file-local symbol as static

[Derrick Stolee]

On 9/14/2018 7:26 PM, Ramsay Jones wrote:

Signed-off-by: Ramsay Jones 
---

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, ...)

  {

[PATCH] midx.c: mark a file-local symbol as static

[Ramsay Jones]

Signed-off-by: Ramsay Jones 
---

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