git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
@ 2017-08-22 21:35 Stefan Beller
  2017-08-22 22:18 ` Junio C Hamano
  0 siblings, 1 reply; 6+ messages in thread
From: Stefan Beller @ 2017-08-22 21:35 UTC (permalink / raw)
  To: gitster; +Cc: git, Stefan Beller

The svn specific declaration of repo_init was not used since 723b7a2789
(vcs-svn: eliminate repo_tree structure, 2010-12-10).

This was noticed when including repository.h via cache.h as that has the
same function with a different signature.

Helped-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
 vcs-svn/repo_tree.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
index 889c6a3c95..8592beb59b 100644
--- a/vcs-svn/repo_tree.h
+++ b/vcs-svn/repo_tree.h
@@ -17,7 +17,6 @@ void repo_commit(uint32_t revision, const char *author,
 		const struct strbuf *log, const char *uuid, const char *url,
 		long unsigned timestamp);
 void repo_diff(uint32_t r1, uint32_t r2);
-void repo_init(void);
 void repo_reset(void);
 
 #endif
-- 
2.14.0.rc0.3.g6c2e499285


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

* Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
  2017-08-22 21:35 [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration Stefan Beller
@ 2017-08-22 22:18 ` Junio C Hamano
  2017-08-22 22:24   ` Stefan Beller
                     ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Junio C Hamano @ 2017-08-22 22:18 UTC (permalink / raw)
  To: Stefan Beller; +Cc: git

Stefan Beller <sbeller@google.com> writes:


> The svn specific declaration of repo_init was not used since 723b7a2789
> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>
> This was noticed when including repository.h via cache.h as that has the
> same function with a different signature.
>
> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---

It looks to me that this is a reduced duplicate of what brian posted
yesterday.  The first two patches in the 6-patch series that you
commented on, I think, covers what this change wants to achieve and
probably a lot more.  I've merged those two already to 'next' and
was about to push the result out.

Thanks.


>  vcs-svn/repo_tree.h | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/vcs-svn/repo_tree.h b/vcs-svn/repo_tree.h
> index 889c6a3c95..8592beb59b 100644
> --- a/vcs-svn/repo_tree.h
> +++ b/vcs-svn/repo_tree.h
> @@ -17,7 +17,6 @@ void repo_commit(uint32_t revision, const char *author,
>  		const struct strbuf *log, const char *uuid, const char *url,
>  		long unsigned timestamp);
>  void repo_diff(uint32_t r1, uint32_t r2);
> -void repo_init(void);
>  void repo_reset(void);
>  
>  #endif

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

* Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
  2017-08-22 22:18 ` Junio C Hamano
@ 2017-08-22 22:24   ` Stefan Beller
  2017-08-22 22:54   ` Jonathan Nieder
  2017-08-22 23:45   ` Jonathan Nieder
  2 siblings, 0 replies; 6+ messages in thread
From: Stefan Beller @ 2017-08-22 22:24 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git@vger.kernel.org

On Tue, Aug 22, 2017 at 3:18 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Stefan Beller <sbeller@google.com> writes:
>
>
>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.
>
> Thanks.
>

Ok, thanks. I did not remember reviewing those.
(I just wanted to fix my odd compile error here,
and currently I build a series on top of jt/packmigrate
so I shot off a quick one liner)

Sorry for the noise.

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

* Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
  2017-08-22 22:18 ` Junio C Hamano
  2017-08-22 22:24   ` Stefan Beller
@ 2017-08-22 22:54   ` Jonathan Nieder
  2017-08-22 23:45   ` Jonathan Nieder
  2 siblings, 0 replies; 6+ messages in thread
From: Jonathan Nieder @ 2017-08-22 22:54 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Stefan Beller, git, brian m. carlson

Junio C Hamano wrote:
> Stefan Beller <sbeller@google.com> writes:

>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.

Thanks for the pointer. I believe you're referring to
https://public-inbox.org/git/20170821000022.26729-2-sandals@crustytoothpaste.net/.

From Stefan's verbal report I was about to send a patch just like
Brian's plus some more patches on top to get rid of the rest of repo_tree.h.
I can build on top of Brian's patch if that's more convenient.

Regards,
Jonathan

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

* Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
  2017-08-22 22:18 ` Junio C Hamano
  2017-08-22 22:24   ` Stefan Beller
  2017-08-22 22:54   ` Jonathan Nieder
@ 2017-08-22 23:45   ` Jonathan Nieder
  2017-08-23  1:10     ` Junio C Hamano
  2 siblings, 1 reply; 6+ messages in thread
From: Jonathan Nieder @ 2017-08-22 23:45 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Stefan Beller, git

Junio C Hamano wrote:
> Stefan Beller <sbeller@google.com> writes:

>> The svn specific declaration of repo_init was not used since 723b7a2789
>> (vcs-svn: eliminate repo_tree structure, 2010-12-10).
>>
>> This was noticed when including repository.h via cache.h as that has the
>> same function with a different signature.
>>
>> Helped-by: Jonathan Nieder <jrnieder@gmail.com>
>> Signed-off-by: Stefan Beller <sbeller@google.com>
>> ---
>
> It looks to me that this is a reduced duplicate of what brian posted
> yesterday.  The first two patches in the 6-patch series that you
> commented on, I think, covers what this change wants to achieve and
> probably a lot more.  I've merged those two already to 'next' and
> was about to push the result out.

I just sent
https://public-inbox.org/git/20170822233732.GX13924@aiede.mtv.corp.google.com/
to fix this more thoroughly.  I can rebase on top of bc/vcs-svn-cleanup
if that is helpful --- just say the word.

Thanks,
Jonathan

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

* Re: [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration
  2017-08-22 23:45   ` Jonathan Nieder
@ 2017-08-23  1:10     ` Junio C Hamano
  0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2017-08-23  1:10 UTC (permalink / raw)
  To: Jonathan Nieder; +Cc: Stefan Beller, git

Jonathan Nieder <jrnieder@gmail.com> writes:

> Junio C Hamano wrote:
> ...
>> It looks to me that this is a reduced duplicate of what brian posted
>> yesterday.  The first two patches in the 6-patch series that you
>> commented on, I think, covers what this change wants to achieve and
>> probably a lot more.  I've merged those two already to 'next' and
>> was about to push the result out.
>
> I just sent
> https://public-inbox.org/git/20170822233732.GX13924@aiede.mtv.corp.google.com/
> to fix this more thoroughly.  I can rebase on top of bc/vcs-svn-cleanup
> if that is helpful --- just say the word.

Yup, as I merged those two preliminary clean-up separately to 'next'
already, it would be more efficient to build on top.  I do not know
what you are planning with the other patches (I only saw Stefan's
one, not your series) so do not yet have suggestion on how to work
well with Brian's series that builds on his two clean-up patches.
Hopefully they are orthogonal?

Thanks.

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

end of thread, other threads:[~2017-08-23  1:10 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-22 21:35 [PATCH] vcs-svn/repo_tree.h: remove repo_init declaration Stefan Beller
2017-08-22 22:18 ` Junio C Hamano
2017-08-22 22:24   ` Stefan Beller
2017-08-22 22:54   ` Jonathan Nieder
2017-08-22 23:45   ` Jonathan Nieder
2017-08-23  1:10     ` Junio C Hamano

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 NNTP newsgroup(s).