From 1690bf10da370e6b90e1f024aa6c802de094de70 Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Fri, 4 Sep 2009 09:11:13 -0400 Subject: [PATCH] GitInterceptor: Refactor renaming hook to use new GitCommand.doMove() So we can update the index in one go. Signed-off-by: Jonas Fonseca --- src/org/nbgit/GitInterceptor.java | 3 +-- src/org/nbgit/util/GitCommand.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/org/nbgit/GitInterceptor.java b/src/org/nbgit/GitInterceptor.java index de2a8f4..13ec9f6 100644 --- a/src/org/nbgit/GitInterceptor.java +++ b/src/org/nbgit/GitInterceptor.java @@ -256,8 +256,7 @@ public class GitInterceptor extends VCSInterceptor { if (status == StatusInfo.STATUS_NOTVERSIONED_NEWLOCALLY || status == StatusInfo.STATUS_NOTVERSIONED_EXCLUDED) { } else if (status == StatusInfo.STATUS_VERSIONED_ADDEDLOCALLY) { - GitCommand.doRemove(root, srcFile, logger); - GitCommand.doAdd(root, dstFile, logger); + GitCommand.doMove(root, srcFile, dstFile, logger); } else { GitCommand.doRenameAfter(root, srcFile, dstFile, logger); } diff --git a/src/org/nbgit/util/GitCommand.java b/src/org/nbgit/util/GitCommand.java index 8f0ed63..246b1f6 100644 --- a/src/org/nbgit/util/GitCommand.java +++ b/src/org/nbgit/util/GitCommand.java @@ -98,13 +98,14 @@ public class GitCommand { } } - public static void doAdd(File root, File dstFile, OutputLogger logger) { + public static void doMove(File root, File srcFile, File dstFile, OutputLogger logger) { try { Repository repo = Git.getInstance().getRepository(root); GitIndex index = repo.getIndex(); Entry entry = index.add(root, dstFile); entry.setAssumeValid(false); + index.remove(root, srcFile); index.write(); } catch (Exception ex) { -- 2.11.4.GIT