From cc7d2765178e2bb43a5dfee0a9851bc917e8465d Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 2 Jun 2013 06:19:44 +0200 Subject: [PATCH] "Delete (keep local)" did not work on folders Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/Commands/RemoveCommand.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 1e2c43e41..9cef874d3 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -20,6 +20,7 @@ Released: Unreleased * Fixed issue #1798: "Paste Recent commits" during Please wait in Commit dialog does not work * Fixed issue #1106: Stairs in log view * Fixed issue #1304: TortoiseGit doesn't see a bare repo within a non-bare one + * "Delete (keep local)" did not work on folders = Release 1.8.3.0 = Released: 2013-05-05 diff --git a/src/TortoiseProc/Commands/RemoveCommand.cpp b/src/TortoiseProc/Commands/RemoveCommand.cpp index 0ca11e5c2..fee3a9f9f 100644 --- a/src/TortoiseProc/Commands/RemoveCommand.cpp +++ b/src/TortoiseProc/Commands/RemoveCommand.cpp @@ -136,7 +136,7 @@ bool RemoveCommand::Execute() if(parser.HasKey(_T("keep"))) { - format= _T("git.exe update-index --force-remove -- \"%s\""); + format= _T("git.exe rm -r -f --cached -- \"%s\""); } else { -- 2.11.4.GIT