[PATCH 06/24] commit: support backup log
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/commit.c | 16 +++++++++++-----
t/t2080-backup-log.sh | 24 ++++++++++++++++++++++++
2 files changed, 35 insertions(+), 5 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index c021b119bb..2bdbeff4a2 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -268,7 +268,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
return ret;
}
-static void add_remove_files(struct string_list *list)
+static void add_remove_files(struct string_list *list, int flags)
{
int i;
for (i = 0; i < list->nr; i++) {
@@ -280,7 +280,7 @@ static void add_remove_files(struct string_list *list)
continue;
if (!lstat(p->string, &st)) {
- if (add_to_cache(p->string, &st, 0))
+ if (add_to_cache(p->string, &st, flags))
die(_("updating files failed"));
} else
remove_file_from_cache(p->string);
@@ -331,8 +331,14 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
struct string_list partial = STRING_LIST_INIT_DUP;
struct pathspec pathspec;
int refresh_flags = REFRESH_QUIET;
+ int add_flags = 0;
+ int core_backup_log = 0;
const char *ret;
+ repo_config_get_bool(the_repository, "core.backuplog", &core_backup_log);
+ if (core_backup_log)
+ add_flags = ADD_CACHE_LOG_UPDATES;
+
if (is_status)
refresh_flags |= REFRESH_UNMERGED;
parse_pathspec(&pathspec, 0,
@@ -391,7 +397,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
*/
if (all || (also && pathspec.nr)) {
hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
- add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
+ add_files_to_cache(also ? prefix : NULL, &pathspec, add_flags);
refresh_cache_or_die(refresh_flags);
update_main_cache_tree(WRITE_TREE_SILENT);
if (write_locked_index(&the_index, &index_lock, 0))
@@ -460,7 +466,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
die(_("cannot read the index"));
hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
- add_remove_files(&partial);
+ add_remove_files(&partial, add_flags);
refresh_cache(REFRESH_QUIET);
update_main_cache_tree(WRITE_TREE_SILENT);
if (write_locked_index(&the_index, &index_lock, 0))
@@ -472,7 +478,7 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
LOCK_DIE_ON_ERROR);
create_base_index(current_head);
- add_remove_files(&partial);
+ add_remove_files(&partial, 0);
refresh_cache(REFRESH_QUIET);
if (write_locked_index(&the_index, &false_lock, 0))
diff --git a/t/t2080-backup-log.sh b/t/t2080-backup-log.sh
index 6b3814c172..b19e26a807 100755
--- a/t/t2080-backup-log.sh
+++ b/t/t2080-backup-log.sh
@@ -39,4 +39,28 @@ test_expect_success 'update-index --keep-backup writes backup log' '
test_cmp expected actual
'
+test_expect_success 'commit -a writes backup log' '
+ test_tick &&
+ echo update-again >>initial.t &&
+ OLD=$(git rev-parse :./initial.t) &&
+ NEW=$(git hash-object initial.t) &&
+ git -c core.backupLog=true commit -am update-again &&
+ echo "$OLD $NEW $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $test_tick -0700 initial.t" >expected &&
+ tail -n1 .git/index.bkl >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'partial commit writes backup log' '
+ rm -f .git/index.bkl &&
+ test_tick &&
+ echo rising >>new-file &&
+ git add -N new-file &&
+ OLD=$EMPTY_BLOB &&
+ NEW=$(git hash-object new-file) &&
+ git -c core.backupLog=true commit -m update-once-more -- new-file initial.t &&
+ echo "$OLD $NEW $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $test_tick -0700 new-file" >expected &&
+ # expect file deletion to not log anything &&
+ test_cmp expected .git/index.bkl
+'
+
test_done
--
2.20.0.rc2.486.g9832c05c3d
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>