Re: [PATCH] git init: activate rerere by default

Subsystems: the rest

5 messages, 4 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] git init: activate rerere by default

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:19

Johannes Schindelin [off-list ref] writes:
Hi,

On Thu, 5 Jul 2007, Junio C Hamano wrote:
quoted
"Alex Riesen" [off-list ref] writes:
quoted
On 7/5/07, Johannes Schindelin [off-list ref] wrote:
quoted
We have a working implementation of rerere since long ago, and we even
make sure that it works as expected in a test case.  It is also a very
useful feature, so why not turn it on for the benefit of users who are
not even aware of it? This patch does that.
Maybe just create in template directory?
Sounds saner.
Does it?

I had the impression that the templates are meant for site-specific 
modifications. My patch tried to make it more standard than that.

For example, you _could_ have set core.logallrefupdates from the 
templates, yet you chose not to, but rather hard-wire it into "git init". 
Which I completely agree to.
I think what Alex meant is this.
diff --git a/templates/rr-cache-- b/templates/rr-cache--
new file mode 100644
index 0000000..fae8870
--- /dev/null
+++ b/templates/rr-cache--
@@ -0,0 +1 @@
+: this is just to ensure the directory exists.

Re: [PATCH] git init: activate rerere by default

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:19

Hi,

On Thu, 5 Jul 2007, Junio C Hamano wrote:
quoted hunk
I think what Alex meant is this.
diff --git a/templates/rr-cache-- b/templates/rr-cache--
new file mode 100644
index 0000000..fae8870
--- /dev/null
+++ b/templates/rr-cache--
@@ -0,0 +1 @@
+: this is just to ensure the directory exists.
Yes, I fully understood.

However, when I use a new version of Git (which happens regularly, since I 
pull quite often), I do not update the templates. I guess that many 
distros do not update their templates as often as the core, because they 
are much more likely to be modified distro-specifically. Further, there 
are some platforms which are insane enough that you cannot trust the 
executable bit, and therefore the templates are disabled by default.

All this means that the given patch would not hardly make rerere as 
widespread as I intended.

Yes, templates are nice. But I don't think that templates are the way to 
go for introducing nice features as rr-cache.

Ciao,
Dscho

Re: [PATCH] git init: activate rerere by default

From: Alex Riesen <hidden>
Date: 2016-06-15 22:43:19

Johannes Schindelin, Thu, Jul 05, 2007 21:22:43 +0200:
Yes, templates are nice. But I don't think that templates are the way to 
go for introducing nice features as rr-cache.
Looks like you're trying to enforce the feature, not introduce.
It changes the user-visible behaviour, and this can be unexpected.

It is not like you see people asking question: "How do I avoid
repeating the same boring conflict?" every day on vger or irc.

That said, the templates are installed with every make install (and I
suppose with every .deb and .rpm), and template is copied in every new
repo, so people will get the rr-cache sooner or later. What's wrong
with "a bit later" than "much sooner"?

Re: [PATCH] git init: activate rerere by default

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:19

Hi,

On Thu, 5 Jul 2007, Alex Riesen wrote:
Johannes Schindelin, Thu, Jul 05, 2007 21:22:43 +0200:
quoted
Yes, templates are nice. But I don't think that templates are the way to 
go for introducing nice features as rr-cache.
Looks like you're trying to enforce the feature, not introduce.
Yes. Actually, since long I wondered if this feature should not be 
controlled by a core.rerere variable.
It changes the user-visible behaviour, and this can be unexpected.
Yes, but I think for the better.
It is not like you see people asking question: "How do I avoid repeating 
the same boring conflict?" every day on vger or irc.
That is because people have been trained to cope with CVS. They do not 
even know rerere exists.
That said, the templates are installed with every make install (and I 
suppose with every .deb and .rpm), and template is copied in every new 
repo, so people will get the rr-cache sooner or later. What's wrong with 
"a bit later" than "much sooner"?
In the part of my reply that you conveniently scissored, I explained that 
it is often not "a bit later", but "never".

Ciao,
Dscho

Re: [PATCH] git init: activate rerere by default

From: しらいしななこ <hidden>
Date: 2016-06-15 22:43:19

Quoting Johannes Schindelin [off-list ref]:
All this means that the given patch would not hardly make rerere as 
widespread as I intended.

Yes, templates are nice. But I don't think that templates are the way to 
go for introducing nice features as rr-cache.
I am sorry, but I can't understand how it works and how it is useful,
after reading the manual page of git-rerere three times.  Are there
"rerere tutorial for stupid newbies" document somewhere?  I earlier
created .git/rr-cache folder but I have not seen anything interesting
happened in my repository.

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/

----------------------------------------------------------------------
Free pop3 email with a spam filter.
http://www.bluebottle.com/tag/5
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help