[PATCH 17/24] config --edit: support backup log
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/config.c | 27 ++++++++++++++++++++++++++-
t/t2080-backup-log.sh | 14 ++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/builtin/config.c b/builtin/config.c
index 84385ef165..a42044d03e 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "cache.h"
+#include "backup-log.h"
#include "config.h"
#include "color.h"
#include "parse-options.h"
@@ -593,6 +594,15 @@ static char *default_user_config(void)
return strbuf_detach(&buf, NULL);
}
+static void hash_one_path(const char *path, struct object_id *oid)
+{
+ struct stat st;
+
+ if (lstat(path, &st) ||
+ index_path(NULL, oid, path, &st, HASH_WRITE_OBJECT))
+ oidclr(oid);
+}
+
int cmd_config(int argc, const char **argv, const char *prefix)
{
int nongit = !startup_info->have_repository;
@@ -735,6 +745,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
}
else if (actions == ACTION_EDIT) {
char *config_file;
+ int core_backup_log = 0;
+ struct object_id old, new;
check_argc(argc, 0, 0);
if (!given_config_source.file && nongit)
@@ -747,6 +759,9 @@ int cmd_config(int argc, const char **argv, const char *prefix)
config_file = given_config_source.file ?
xstrdup(given_config_source.file) :
git_pathdup("config");
+ repo_config_get_bool(the_repository, "core.backuplog",
+ &core_backup_log);
+ oidclr(&old);
if (use_global_config) {
int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666);
if (fd >= 0) {
@@ -757,9 +772,19 @@ int cmd_config(int argc, const char **argv, const char *prefix)
}
else if (errno != EEXIST)
die_errno(_("cannot create configuration file %s"), config_file);
- }
+ } else if (!given_config_source.file && core_backup_log)
+ hash_one_path(git_path("config"), &old);
launch_editor(config_file, NULL, NULL);
free(config_file);
+ if (!is_null_oid(&old)) {
+ struct strbuf sb = STRBUF_INIT;
+
+ hash_one_path(git_path("config"), &new);
+ bkl_append(&sb, "config", &old, &new);
+ mkdir(git_path("common"), 0777);
+ bkl_write(git_path("common/gitdir.bkl"), &sb);
+ strbuf_release(&sb);
+ }
}
else if (actions == ACTION_SET) {
int ret;
diff --git a/t/t2080-backup-log.sh b/t/t2080-backup-log.sh
index 3cdabc2ba2..dbd19db757 100755
--- a/t/t2080-backup-log.sh
+++ b/t/t2080-backup-log.sh
@@ -164,4 +164,18 @@ test_expect_success 'backup-log log' '
test_cmp expected actual
'
+test_expect_success 'config --edit makes a backup' '
+ cat >edit.sh <<-EOF &&
+ #!$SHELL_PATH
+ echo ";Edited" >>"\$1"
+ EOF
+ chmod +x edit.sh &&
+ OLD=$(git hash-object .git/config) &&
+ EDITOR=./edit.sh git -c core.backupLog=true config --edit &&
+ NEW=$(git hash-object .git/config) &&
+ grep config .git/common/gitdir.bkl &&
+ grep ^$OLD .git/common/gitdir.bkl &&
+ grep $NEW .git/common/gitdir.bkl
+'
+
test_done
--
2.20.0.rc2.486.g9832c05c3d
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>