From a800f6b725075c9c808a5f9672348b1d0d9e08cd Mon Sep 17 00:00:00 2001 From: Ralph Ursprung Date: Mon, 24 Oct 2022 14:51:04 +0200 Subject: [PATCH] add `.worktrees/` to `.gitignore` the `.worktrees/` folder is used in the guide for manual backporting as the location where to create the worktree for the backport branch. as this is inside of the repository the folder will be reported as an untracked file. to avoid this, i've now added it to `.gitignore`. though it might be better to create the worktree outside of the repository, the documentation on it doesn't comment explicitly on using it inside of the main worktree, however none of the examples do that. Signed-off-by: Ralph Ursprung --- .gitignore | 3 +++ CHANGELOG.md | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index a0dabfb8798f9..344dec8d1b088 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,6 @@ testfixtures_shared/ # build files generated doc-tools/missing-doclet/bin/ + +# used for backporting +.worktrees/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fef74a41c69b..a10ee3e38170c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Add dev guide for dealing with flakey tests ([4868](https://github.com/opensearch-project/OpenSearch/pull/4868)) - Update pull request template ([#4851](https://github.com/opensearch-project/OpenSearch/pull/4851)) - Added missing no-jdk distributions ([#4722](https://github.com/opensearch-project/OpenSearch/pull/4722)) +- Added `.worktrees` (used for worktrees, e.g. for backporting) to `.gitignore` ([#4885](https://github.com/opensearch-project/OpenSearch/pull/4885)) ### Dependencies - Bumps `log4j-core` from 2.18.0 to 2.19.0