[PATCH] shallow: remove unused variable

Subsystems: the rest

STALE3038d

2 messages, 2 authors, 2018-05-16 · open the first message on its own page

[PATCH] shallow: remove unused variable

From: Ramsay Jones <hidden>
Date: 2018-05-16 22:10:43

Signed-off-by: Ramsay Jones <redacted>
---

Hi Stefan,

If you need to re-roll your 'sb/object-store-grafts' branch, could
you please squash this into the relevant patch (whichever one that
would be)! ;-)

I have not looked to see which patch needs to change (just being
lazy, sorry!), but this variable was introduced by commit d73b49b707
("shallow: migrate shallow information into the object parser", 2018-05-15).

That commit seems to rename the 'shallow_stat' symbol to the 'the_repository_shallow_stat' symbol, but at the same time adds an 'shallow_stat' field to the parsed_object_pool struct, so ... :(

Thanks!

ATB,
Ramsay Jones

 shallow.c | 2 --
 1 file changed, 2 deletions(-)
diff --git a/shallow.c b/shallow.c
index 74bc78801..51447608a 100644
--- a/shallow.c
+++ b/shallow.c
@@ -17,8 +17,6 @@
 #include "commit-slab.h"
 #include "repository.h"
 
-struct stat_validity the_repository_shallow_stat;
-
 void set_alternate_shallow_file(struct repository *r, const char *path, int override)
 {
 	if (r->parsed_objects->is_shallow != -1)
-- 
2.17.0

Re: [PATCH] shallow: remove unused variable

From: Stefan Beller <hidden>
Date: 2018-05-16 22:19:17

Hi Ramsay,
That commit seems to rename the 'shallow_stat' symbol to the 'the_repository_shallow_stat' symbol, but at the same time adds an 'shallow_stat' field to the parsed_object_pool struct, so ... :(
Thanks for catching this! it shows again, how rebase can be a
dangerous tool if not used properly.
I'll look into this, and the solution most likely will be to squash
this patch into that commit.

Thanks!
Stefan
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help