[RFC/PATCH] enable rerere by default
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 6, 2007, 10:13 UTC
- Message-ID
- <Pine.LNX.4.63.0702061103070.22628@wbgn013.biozentrum.uni-wuerzburg.de>
Since the theme of the upcoming release is the (true) Wow factor, we should enable this feature by default. New users are not likely to learn of that feature otherwise.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> ---
I know it is quite late in the game for 1.5.0, but since the theme is usability and user-friendliness, I cannot think of a better release to enable rerere by default, if that should ever happen.
Comments?
builtin-init-db.c | 2 ++ t/t4200-rerere.sh | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/builtin-init-db.c b/builtin-init-db.c index 12e43d0..2504507 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -260,6 +260,8 @@ static int create_default_files(const char *git_dir, const char *template_path) /* allow template config file to override the default */ if (log_all_ref_updates == -1) git_config_set("core.logallrefupdates", "true"); + strcpy(path + len, "rr-cache"); + safe_create_dir(path, 1); } return reinit; } diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 91be272..8187038 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -37,9 +37,6 @@ git checkout -b second master git show first:a1 | sed 's/To die, t/To die! T/' > a1 git commit -q -a -m second -# activate rerere -mkdir .git/rr-cache - test_expect_failure 'conflicting merge' 'git pull . first' sha1=4f58849a60b4f969a2848966b6d02893b783e8fb