git@vger.kernel.org mailing list mirror (one of many)
 help / Atom feed
* [PATCH] shallow: remove unused variable
@ 2018-05-16 22:10 Ramsay Jones
  2018-05-16 22:19 ` Stefan Beller
  0 siblings, 1 reply; 2+ messages in thread
From: Ramsay Jones @ 2018-05-16 22:10 UTC (permalink / raw)
  To: Stefan Beller; +Cc: Junio C Hamano, GIT Mailing-list


Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
---

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] shallow: remove unused variable
  2018-05-16 22:10 [PATCH] shallow: remove unused variable Ramsay Jones
@ 2018-05-16 22:19 ` Stefan Beller
  0 siblings, 0 replies; 2+ messages in thread
From: Stefan Beller @ 2018-05-16 22:19 UTC (permalink / raw)
  To: Ramsay Jones; +Cc: Junio C Hamano, GIT Mailing-list

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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-16 22:10 [PATCH] shallow: remove unused variable Ramsay Jones
2018-05-16 22:19 ` Stefan Beller

git@vger.kernel.org mailing list mirror (one of many)

Archives are clonable:
	git clone --mirror https://public-inbox.org/git
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.version-control.git
	nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git
	nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git
	nntp://news.gmane.org/gmane.comp.version-control.git

 note: .onion URLs require Tor: https://www.torproject.org/
       or Tor2web: https://www.tor2web.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox