Update "git rev-parse" invocation to work in Git 2.25.0
ClosedPublic
Actions

Authored by epriestley on Jan 16 2020, 7:37 PM.

Details

Reviewers: None
Maniphest Tasks: T13479: Update "git rev-parse --show-toplevel" for Git 2.25.0
Commits: rP6ccb6a6463f7: Update "git rev-parse" invocation to work in Git 2.25.0

Summary

Fixes T13479. The behavior of "git rev-parse --show-toplevel" has changed in Git 2.25.0, and it now fails in bare repositories.

Instead, use "git rev-parse --git-dir" to sanity-check the working copy. This appears to have more stable behavior across Git versions, although it's a little more complicated for our purposes.

Test Plan

Ran bin/repository update ... on an observed, bare repository.
...on an observed, non-bare ("legacy") repository.
...on a hosted, bare repository.

Diff Detail

Repository

rP Phabricator

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Jan 16 2020, 7:37 PM

Harbormaster completed remote builds in B23731: Diff 49905.Jan 16 2020, 7:38 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jan 16 2020, 7:38 PM

epriestley requested review of this revision.

Closed by commit rP6ccb6a6463f7: Update "git rev-parse" invocation to work in Git 2.25.0 (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rP6ccb6a6463f7: Update "git rev-parse" invocation to work in Git 2.25.0.

Revision Contents
Changeset List

Path

Size

src/

applications/

repository/

engine/

PhabricatorRepositoryPullEngine.php

51 lines

Diff 49906

View Options

src/applications/repository/engine/PhabricatorRepositoryPullEngine.php

Update "git rev-parse" invocation to work in Git 2.25.0ClosedPublicActions