From 7f7d40eef7c97694c432c49f5c54117f7bcf2ddd Mon Sep 17 00:00:00 2001 From: verhasi Date: Thu, 22 Nov 2018 15:03:05 +0100 Subject: [PATCH 1/3] Never delete the root gitignore file The root git ignore file has additional default items not to be deleted even though the corresponding aka the root jazz ignore file is deleted. --- .../src/to/rtc/cli/migrate/git/GitMigrator.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java index c229d91..8ce38fa 100644 --- a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java +++ b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java @@ -315,11 +315,14 @@ private void handleJazzignores(Set relativeFileNames) { // change/add case List ignoreContent = JazzignoreTranslator.toGitignore(jazzIgnore); Files.writeLines(new File(rootDir, gitignoreFile), ignoreContent, getCharset(), false); + additionalNames.add(gitignoreFile); } else { - // delete case - new File(rootDir, gitignoreFile).delete(); - } - additionalNames.add(gitignoreFile); + // delete case except for root git ignore file + if(!".gitignore".equals(gitignoreFile)){ + new File(rootDir, gitignoreFile).delete(); + additionalNames.add(gitignoreFile); + } + } } } // add additional modified name From 7fab8408c2fd15660f3699c3c024394cb241c36d Mon Sep 17 00:00:00 2001 From: verhasi Date: Thu, 22 Nov 2018 15:18:33 +0100 Subject: [PATCH 2/3] update root gitignore during commit --- .../src/to/rtc/cli/migrate/git/GitMigrator.java | 1 + 1 file changed, 1 insertion(+) diff --git a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java index 8ce38fa..efa6f50 100644 --- a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java +++ b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java @@ -212,6 +212,7 @@ SortedSet getExistingIgnoredFiles() { private void gitCommit(PersonIdent ident, String comment) { try { + initRootGitignore(rootDir); // add all untracked files Status status = git.status().call(); From 5ca0523aeaa54b84a95f97d2f8d9fb72122f6b99 Mon Sep 17 00:00:00 2001 From: verhasi Date: Thu, 22 Nov 2018 17:03:14 +0100 Subject: [PATCH 3/3] In change/add case no need to modify the root git ignore file --- .../src/to/rtc/cli/migrate/git/GitMigrator.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java index efa6f50..03a4523 100644 --- a/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java +++ b/rtc2git.cli.extension/src/to/rtc/cli/migrate/git/GitMigrator.java @@ -314,16 +314,18 @@ private void handleJazzignores(Set relativeFileNames) { String gitignoreFile = matcher.group(1).concat(".gitignore"); if (jazzIgnore.exists()) { // change/add case - List ignoreContent = JazzignoreTranslator.toGitignore(jazzIgnore); - Files.writeLines(new File(rootDir, gitignoreFile), ignoreContent, getCharset(), false); - additionalNames.add(gitignoreFile); + if (!".gitignore".equals(gitignoreFile)) { + List ignoreContent = JazzignoreTranslator.toGitignore(jazzIgnore); + Files.writeLines(new File(rootDir, gitignoreFile), ignoreContent, getCharset(), false); + additionalNames.add(gitignoreFile); + } } else { // delete case except for root git ignore file - if(!".gitignore".equals(gitignoreFile)){ + if (!".gitignore".equals(gitignoreFile)) { new File(rootDir, gitignoreFile).delete(); additionalNames.add(gitignoreFile); } - } + } } } // add additional modified name