8365048: idea.sh script does not correctly detect/handle git worktrees

[david-beaumont]

Allows files or directories called .git to indicate likely use of Git for VCS in IntelliJ.
Tested locally in a worktree and normal repository. It produces:

in both cases, as expected.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8365048: idea.sh script does not correctly detect/handle git worktrees (Bug - P4)

Reviewers

• Volkan Yazici (@vy - Committer) Review applies to 582a0143
• Erik Joelsson (@erikj79 - Reviewer) Review applies to 582a0143
• Maurizio Cimadamore (@mcimadamore - Reviewer) Review applies to 582a0143
• Magnus Ihse Bursie (@magicus - Reviewer) Review applies to 582a0143
• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26777/head:pull/26777
$ git checkout pull/26777

Update a local copy of the PR:
$ git checkout pull/26777
$ git pull https://git.openjdk.org/jdk.git pull/26777/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 26777

View PR using the GUI difftool:
$ git pr show -t 26777

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26777.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back david-beaumont! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@david-beaumont This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8365048: idea.sh script does not correctly detect/handle git worktrees

Reviewed-by: shade, vyazici, erikj, mcimadamore, ihse

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 167 new commits pushed to the master branch:

• b0f98df: 8365416: java.desktop no longer needs preview feature access
• dd113c8: 8364628: Serial: Refactor SerialHeap::mem_allocate_work
• 4152099: 8365098: make/RunTests.gmk generates a wrong path to test artifacts on Alpine
• ... and 164 more: https://git.openjdk.org/jdk/compare/b9f7caed775e86e71f7d37789cb196fb1444ef12...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@vy, @erikj79, @mcimadamore, @magicus, @shipilev) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

[openjdk]

@david-beaumont The following labels will be automatically applied to this pull request:

• build
• core-libs
• ide-support

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 01: Full - Incremental (307574fa)
• 00: Full (582a0143)

[shipilev]

Suggested change

	# Git workstrees use a '.git' file rather than directory, so test both.
	# Git worktrees use a '.git' file rather than directory, so test both.

Right?

[david-beaumont]

doh - thanks

[magicus]

LGTM, if you fix the typo in the comment.

[david-beaumont]

/integrate

[openjdk]

@david-beaumont This pull request has not yet been marked as ready for integration.

[david-beaumont]

/integrate

[openjdk]

@david-beaumont
Your change (at version 307574f) is now ready to be sponsored by a Committer.

[shipilev]

/sponsor

[openjdk]

Going to push as commit ba23105.
Since your change was applied there have been 168 commits pushed to the master branch:

• 26ccb3c: 8362530: VM crash with -XX:+PrintTieredEvents when collecting AOT profiling
• b0f98df: 8365416: java.desktop no longer needs preview feature access
• dd113c8: 8364628: Serial: Refactor SerialHeap::mem_allocate_work
• ... and 165 more: https://git.openjdk.org/jdk/compare/b9f7caed775e86e71f7d37789cb196fb1444ef12...master

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev @david-beaumont Pushed as commit ba23105.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.