[21/24] checkout -f: keep backup of overwritten files

Message ID	20181209104419.12639-22-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> To: git@vger.kernel.org Cc: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> Subject: [PATCH 21/24] checkout -f: keep backup of overwritten files Date: Sun, 9 Dec 2018 11:44:16 +0100 Message-Id: <20181209104419.12639-22-pclouds@gmail.com> In-Reply-To: <20181209104419.12639-1-pclouds@gmail.com> References: <20181209104419.12639-1-pclouds@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Add backup log \| expand [RFC,00/24] Add backup log [01/24] doc: introduce new "backup log" concept [02/24] backup-log: add "update" subcommand [03/24] read-cache.c: new flag for add_index_entry() to write to backup log [04/24] add: support backup log [05/24] update-index: support backup log with --keep-backup [06/24] commit: support backup log [07/24] apply: support backup log with --keep-backup [08/24] add--interactive: support backup log [09/24] backup-log.c: add API for walking backup log [10/24] backup-log: add cat command [11/24] backup-log: add diff command [12/24] backup-log: add log command [13/24] backup-log: add prune command [14/24] gc: prune backup logs [15/24] backup-log: keep all blob references around [16/24] sha1-file.c: let index_path() accept NULL istate [17/24] config --edit: support backup log [18/24] refs: keep backup of deleted reflog [19/24] unpack-trees.c: keep backup of ignored files being overwritten [20/24] reset --hard: keep backup of overwritten files [21/24] checkout -f: keep backup of overwritten files [22/24] am: keep backup of overwritten files on --skip or --abort [23/24] rebase: keep backup of overwritten files on --skip or --abort [24/24] FIXME

Message ID

20181209104419.12639-22-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
Subject: [PATCH 21/24] checkout -f: keep backup of overwritten files
Date: Sun,  9 Dec 2018 11:44:16 +0100
Message-Id: <20181209104419.12639-22-pclouds@gmail.com>
In-Reply-To: <20181209104419.12639-1-pclouds@gmail.com>
References: <20181209104419.12639-1-pclouds@gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Add backup log | expand

Commit Message

Duy Nguyen Dec. 9, 2018, 10:44 a.m. UTC

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 builtin/checkout.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/builtin/checkout.c b/builtin/checkout.c
index b5e27a5f6d..3ae001ae35 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -438,6 +438,8 @@  static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 	opts.verbose_update = o->show_progress;
 	opts.src_index = &the_index;
 	opts.dst_index = &the_index;
+	repo_config_get_bool(the_repository, "core.backupLog",
+			     &opts.keep_backup);
 	parse_tree(tree);
 	init_tree_desc(&tree_desc, tree->buffer, tree->size);
 	switch (unpack_trees(1, &tree_desc, &opts)) {

[21/24] checkout -f: keep backup of overwritten files

Commit Message

Patch