diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-07-06 13:05:59 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-06 22:39:15 -0700 |
| commit | b4372ef136b0a5a2c1dbd88a11dd72b478d0e0a5 (patch) | |
| tree | 904accc21f5d15f6d6f49ba2dbe004072764c16a /git-rebase.sh | |
| parent | b2493649fe41f8a0db48ff4e809ea53c8a304a61 (diff) | |
| download | git-b4372ef136b0a5a2c1dbd88a11dd72b478d0e0a5.tar.gz | |
Enable "git rerere" by the config variable rerere.enabled
Earlier, "git rerere" was enabled by creating the directory
.git/rr-cache. That is definitely not in line with most other
features, which are enabled by a config variable.
So, check the config variable "rerere.enabled". If it is set
to "false" explicitely, do not activate rerere, even if
.git/rr-cache exists. This should help when you want to disable
rerere temporarily.
If "rerere.enabled" is not set at all, fall back to detection
of the directory .git/rr-cache.
[jc: with minimum tweaks]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase.sh')
| -rwxr-xr-x | git-rebase.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 7a02f2975d..cbafa14ed5 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -101,7 +101,7 @@ call_merge () { return ;; 1) - test -d "$GIT_DIR/rr-cache" && git rerere + git rerere die "$RESOLVEMSG" ;; 2) @@ -160,10 +160,7 @@ do --skip) if test -d "$dotest" then - if test -d "$GIT_DIR/rr-cache" - then - git rerere clear - fi + git rerere clear prev_head="`cat $dotest/prev_head`" end="`cat $dotest/end`" msgnum="`cat $dotest/msgnum`" @@ -181,10 +178,7 @@ do exit ;; --abort) - if test -d "$GIT_DIR/rr-cache" - then - git rerere clear - fi + git rerere clear if test -d "$dotest" then rm -r "$dotest" |