{"thread":{"id":"6710","subject":"[RFC/PATCH] enable rerere by default","startedAt":"2007-02-06T10:13:16Z","lastAt":"2007-02-06T23:19:00Z","messageCount":7,"participants":["Johannes Schindelin","Alex Riesen","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"33711","messageId":"Pine.LNX.4.63.0702061103070.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6710","inReplyTo":null,"subject":"[RFC/PATCH] enable rerere by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-06T10:13:16Z","receivedAt":"2007-02-06T10:13:16Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"\nSince the theme of the upcoming release is the (true) Wow factor, we \nshould enable this feature by default. New users are not likely to learn \nof that feature otherwise.\n\nSigned-off-by: Johannes Schindelin \n---\n\n\tI know it is quite late in the game for 1.5.0, but since the theme \n\tis usability and user-friendliness, I cannot think of a better \n\trelease to enable rerere by default, if that should ever happen.\n\n\tComments?\n\n builtin-init-db.c | 2 ++\n t/t4200-rerere.sh | 3 ---\n 2 files changed, 2 insertions(+), 3 deletions(-)\n\ndiff --git a/builtin-init-db.c b/builtin-init-db.c\nindex 12e43d0..2504507 100644\n--- a/builtin-init-db.c\n+++ b/builtin-init-db.c\n@@ -260,6 +260,8 @@ static int create_default_files(const char *git_dir, const char *template_path)\n \t\t/* allow template config file to override the default */\n \t\tif (log_all_ref_updates == -1)\n \t\t git_config_set(\"core.logallrefupdates\", \"true\");\n+\t\tstrcpy(path + len, \"rr-cache\");\n+\t\tsafe_create_dir(path, 1);\n \t}\n \treturn reinit;\n }\ndiff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh\nindex 91be272..8187038 100755\n--- a/t/t4200-rerere.sh\n+++ b/t/t4200-rerere.sh\n@@ -37,9 +37,6 @@ git checkout -b second master\n git show first:a1 | sed 's/To die, t/To die! T/' > a1\n git commit -q -a -m second\n \n-# activate rerere\n-mkdir .git/rr-cache\n-\n test_expect_failure 'conflicting merge' 'git pull . first'\n \n sha1=4f58849a60b4f969a2848966b6d02893b783e8fb\n"},{"id":"33722","messageId":"81b0412b0702060556r3e366defwe4b7afabdf5ffb7c@mail.gmail.com","threadId":"6710","inReplyTo":"Pine.LNX.4.63.0702061103070.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-02-06T13:56:32Z","receivedAt":"2007-02-06T13:56:32Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 2/6/07, Johannes Schindelin wrote:\n>\n> Since the theme of the upcoming release is the (true) Wow factor, we\n> should enable this feature by default. New users are not likely to learn\n> of that feature otherwise.\n>\n> Signed-off-by: Johannes Schindelin \n> ---\n>\n> I know it is quite late in the game for 1.5.0, but since the theme\n> is usability and user-friendliness, I cannot think of a better\n> release to enable rerere by default, if that should ever happen.\n>\n> Comments?\n\nHow do I disable rerere by default?\n"},{"id":"33728","messageId":"Pine.LNX.4.63.0702061602360.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6710","inReplyTo":"81b0412b0702060556r3e366defwe4b7afabdf5ffb7c@mail.gmail.com","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-06T15:03:58Z","receivedAt":"2007-02-06T15:03:58Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 6 Feb 2007, Alex Riesen wrote:\n\n> On 2/6/07, Johannes Schindelin wrote:\n> > \n> > Since the theme of the upcoming release is the (true) Wow factor, we\n> > should enable this feature by default. New users are not likely to learn\n> > of that feature otherwise.\n> > \n> > Signed-off-by: Johannes Schindelin \n> > ---\n> > \n> > I know it is quite late in the game for 1.5.0, but since the theme\n> > is usability and user-friendliness, I cannot think of a better\n> > release to enable rerere by default, if that should ever happen.\n> > \n> > Comments?\n> \n> How do I disable rerere by default?\n\nHow'd you like it? Should this rather become a config variable, or do you \nwant to make a file called \"rr-cache\" in the templates, which just \ncontains a word \"disabled\"? (git-rerere checks if a _directory_ \n$GIT_DIR/rr-cache exists.)\n\nCiao,\nDscho\n"},{"id":"33733","messageId":"81b0412b0702060739y35c00332q8945a33743084219@mail.gmail.com","threadId":"6710","inReplyTo":"Pine.LNX.4.63.0702061602360.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-02-06T15:39:52Z","receivedAt":"2007-02-06T15:39:52Z","isPatch":true,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 2/6/07, Johannes Schindelin wrote:\n> > > I know it is quite late in the game for 1.5.0, but since the theme\n> > > is usability and user-friendliness, I cannot think of a better\n> > > release to enable rerere by default, if that should ever happen.\n> > >\n> > > Comments?\n> >\n> > How do I disable rerere by default?\n>\n> How'd you like it? Should this rather become a config variable, or do you\n> want to make a file called \"rr-cache\" in the templates, which just\n> contains a word \"disabled\"? (git-rerere checks if a _directory_\n> $GIT_DIR/rr-cache exists.)\n\nI suggest a config variable defaulting to \"on\", able to disable rerere even if\nrr-cache exists. So the var has at least theoretical use also after a\nrepo is created.\nI'll put it in templates config then, and modify existing repos to\nswitch it \"off\"\n(so I always have it mentioned in the configs).\nNewbies, who don't have it own templates, wont even notice it.\nUnless it is put into the generated config, that is: like\ncore.logallrefupdates -\nit can be in templates config, or git-init writes it.\n"},{"id":"33735","messageId":"Pine.LNX.4.63.0702061649520.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6710","inReplyTo":"81b0412b0702060739y35c00332q8945a33743084219@mail.gmail.com","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-06T15:53:15Z","receivedAt":"2007-02-06T15:53:15Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 6 Feb 2007, Alex Riesen wrote:\n\n> On 2/6/07, Johannes Schindelin wrote:\n> > > > I know it is quite late in the game for 1.5.0, but since the theme \n> > > > is usability and user-friendliness, I cannot think of a better \n> > > > release to enable rerere by default, if that should ever happen.\n> > > >\n> > > > Comments?\n> > >\n> > > How do I disable rerere by default?\n> > \n> > How'd you like it? Should this rather become a config variable, or do \n> > you want to make a file called \"rr-cache\" in the templates, which just \n> > contains a word \"disabled\"? (git-rerere checks if a _directory_ \n> > $GIT_DIR/rr-cache exists.)\n> \n> I suggest a config variable defaulting to \"on\", able to disable rerere \n> even if rr-cache exists.\n\nOkay, but this is a little involved:\n\n$ grep -l rr-cache *.{c,h,sh,perl}\nbuiltin-rerere.c\ngit-am.sh\ngit-commit.sh\ngit-merge.sh\ngit-rebase.sh\ngit-reset.sh\n\nSo, unless the list agrees that rerere should be enabled by default, I \nwill not make a patch to move rerere enabling to the config.\n\nCiao,\nDscho\n"},{"id":"33758","messageId":"7vhctyhon2.fsf@assigned-by-dhcp.cox.net","threadId":"6710","inReplyTo":"Pine.LNX.4.63.0702061602360.22628@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-02-06T23:06:41Z","receivedAt":"2007-02-06T23:06:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin writes:\n\n>> How do I disable rerere by default?\n>\n> How'd you like it? Should this rather become a config variable, or do you \n> want to make a file called \"rr-cache\" in the templates, which just \n> contains a word \"disabled\"? (git-rerere checks if a _directory_ \n> $GIT_DIR/rr-cache exists.)\n\nIs it so bad to do \"rm -rf .git/rr-cache\"?\n"},{"id":"33759","messageId":"Pine.LNX.4.63.0702070016360.22628@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"6710","inReplyTo":"7vhctyhon2.fsf@assigned-by-dhcp.cox.net","subject":"Re: [RFC/PATCH] enable rerere by default","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-02-06T23:19:00Z","receivedAt":"2007-02-06T23:19:00Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 6 Feb 2007, Junio C Hamano wrote:\n\n> Johannes Schindelin writes:\n> \n> >> How do I disable rerere by default?\n> >\n> > How'd you like it? Should this rather become a config variable, or do you \n> > want to make a file called \"rr-cache\" in the templates, which just \n> > contains a word \"disabled\"? (git-rerere checks if a _directory_ \n> > $GIT_DIR/rr-cache exists.)\n> \n> Is it so bad to do \"rm -rf .git/rr-cache\"?\n\nI guess the problem is that you cannot do that by a hook, or by installing \nappropriate templates.\n\nSince the test for rr-cache always is a test for a directory, it might \nmake sense to _not_ fail in init-db when creating the directory. In that \ncase, rerere can be disabled by installing templates which make rr-cache a \n_file_.\n\nCiao,\nDscho\n"}]}