threads / discuss / 20252

Slight in error in git-rerere help page

Subject: Slight in error in git-rerere help page

## tl;dr

3 messages between Jul 28, 2009 and Jul 28, 2009.

replies: 2people: 2as markdown or json

François Pinard· Jul 28, 2009, 02:20 UTC · lore
Hi, people.  This is for git version 1.6.4.rc3.12.gdf73a
The output of "git help rerere" contains:
   You need to set the configuration variable rerere.enabled to enable
   this command.

It seems that that "enable" is not a proper value. If I used it over a small repository, I get:

   22:17:33 0 pinard@phenix:etc $ git config rerere.enabled enable
   22:17:44 0 pinard@phenix:etc $ git gc
   Counting objects: 1072, done.
   Compressing objects: 100% (559/559), done.
   Writing objects: 100% (1072/1072), done.
   Total 1072 (delta 460), reused 1072 (delta 460)
   fatal: bad config value for 'rerere.enabled' in .git/config
   error: failed to run rerere
Removing the rerere section repairs this last problem.

P.S. - I'm also a bit curious about why rerere is needed for a garbage collection.

-- 
François Pinard   http://pinard.progiciels-bpi.ca
François Pinard· Jul 28, 2009, 02:28 UTC · re: François Pinard · lore

Re: Slight in error in git-rerere help page

pinard@iro.umontreal.ca (François Pinard) writes:
Show 23 quoted lines
> Hi, people.  This is for git version 1.6.4.rc3.12.gdf73a
>
> The output of "git help rerere" contains:
>
>    You need to set the configuration variable rerere.enabled to enable
>    this command.
>
> It seems that that "enable" is not a proper value.  If I used it over a
> small repository, I get:
>
>    22:17:33 0 pinard@phenix:etc $ git config rerere.enabled enable
>    22:17:44 0 pinard@phenix:etc $ git gc
>    Counting objects: 1072, done.
>    Compressing objects: 100% (559/559), done.
>    Writing objects: 100% (1072/1072), done.
>    Total 1072 (delta 460), reused 1072 (delta 460)
>    fatal: bad config value for 'rerere.enabled' in .git/config
>    error: failed to run rerere
>
> Removing the rerere section repairs this last problem.
>
> P.S. - I'm also a bit curious about why rerere is needed for a garbage
> collection.

I now see my mistake, which is one of misreading English. Sorry for my noise. Thanks!

-- 
François Pinard   http://pinard.progiciels-bpi.ca
Michael J Gruber· Jul 28, 2009, 14:42 UTC · re: François Pinard · lore

[PATCH] git-rerere.txt: Clarify ambiguity of the config variable

Use the less ambiguous "set variable foo in order to enable bar" rather than "set variable foo to enable bar" which may trick users into assuming that "enable" is a good value for "foo".

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
I know there is no way to misunderstand this if one looks at the whole
sentence, but still I deem it worthwhile to make it easier on the reader.
Patch is against maint (git-rerere.txt does not have any more recent changes).
 Documentation/git-rerere.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index a53c3cd..7dd515b 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -23,7 +23,7 @@ on the initial manual merge, and applying previously recorded
 hand resolutions to their corresponding automerge results.
 
 [NOTE]
-You need to set the configuration variable rerere.enabled to
+You need to set the configuration variable rerere.enabled in order to
 enable this command.
 
 

-- 
1.6.4.rc3.201.gd9d59

← back to recent threads