Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(dev-infra): support running scripts from within a detached head #37737

Conversation

devversion
Copy link
Member

Scripts provided in the ng-dev command might use local git
commands. For such scripts, we keep track of the branch that
has been checked out before the command has been invoked.

We do this so that we can later (upon command completion)
restore back to the original branch. We do not want to
leave the Git repository in a dirty state.

It looks like this logic currently only deals with branches
but does not work properly when a command is invoked from
a detached head. We can make it work by just checking out
the previous revision (if no branch is checked out).

Scripts provided in the `ng-dev` command might use local `git`
commands. For such scripts, we keep track of the branch that
has been checked out before the command has been invoked.

We do this so that we can later (upon command completion)
restore back to the original branch. We do not want to
leave the Git repository in a dirty state.

It looks like this logic currently only deals with branches
but does not work properly when a command is invoked from
a detached head. We can make it work by just checking out
the previous revision (if no branch is checked out).
@devversion devversion added action: review The PR is still awaiting reviews from at least one requested reviewer target: patch This PR is targeted for the next patch release area: dev-infra Issues related to Angular's own dev infra (build, test, CI, releasing) labels Jun 25, 2020
@ngbot ngbot bot added this to the needsTriage milestone Jun 25, 2020
@ngbot ngbot bot modified the milestone: needsTriage Jun 25, 2020
Copy link
Member

@josephperrott josephperrott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@josephperrott josephperrott removed the action: review The PR is still awaiting reviews from at least one requested reviewer label Jun 26, 2020
@devversion devversion added the action: merge The PR is ready for merge by the caretaker label Jun 26, 2020
AndrewKushnir pushed a commit that referenced this pull request Jun 26, 2020
…37737)

Scripts provided in the `ng-dev` command might use local `git`
commands. For such scripts, we keep track of the branch that
has been checked out before the command has been invoked.

We do this so that we can later (upon command completion)
restore back to the original branch. We do not want to
leave the Git repository in a dirty state.

It looks like this logic currently only deals with branches
but does not work properly when a command is invoked from
a detached head. We can make it work by just checking out
the previous revision (if no branch is checked out).

PR Close #37737
drewswanner pushed a commit to drewswanner/angular that referenced this pull request Jun 29, 2020
* upstream/master: (861 commits)
  ci: decrease payload size limit for integration tests (angular#37784)
  fix(core): error when invoking callbacks registered via ViewRef.onDestroy (angular#37543)
  fix(core): don't consider inherited NG_ELEMENT_ID during DI (angular#37574)
  ci: decrease expected AIO and integration payload sizes (angular#36578) (angular#36578)
  fix(core): determine required DOMParser feature availability (angular#36578) (angular#36578)
  refactor(core): split inert strategies to separate classes (angular#36578) (angular#36578)
  fix(core): do not trigger CSP alert/report in Firefox and Chrome (angular#36578) (angular#36578)
  fix(language-service): incorrect autocomplete results on unknown symbol (angular#37518)
  docs: release notes for the v10.0.1 release
  ci: exclude "docs" commit type from minBodyLength commit message validation (angular#37764)
  feat(dev-infra): add support for minBodyLengthTypeExcludes to  commit-message validation (angular#37764)
  feat(platform-browser): Allow `sms`-URLs (angular#31463)
  refactor(core): throw more descriptive error message in case of invalid host element (angular#35916)
  build: move shims_for_IE to third_party directory (angular#37624)
  refactor(compiler-cli): Remove any cast for CompilerHost (angular#37079)
  fix(language-service): reinstate getExternalFiles() (angular#37750)
  docs: correct outdated dev instructions for public api golds (angular#37026)
  docs: add note about the month being zero-based in the Date constructor (angular#37770)
  fix(dev-infra): merge script should not always require full repo permissions (angular#37718)
  fix(dev-infra): support running scripts from within a detached head (angular#37737)
  ...
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Jul 27, 2020
profanis pushed a commit to profanis/angular that referenced this pull request Sep 5, 2020
…ngular#37737)

Scripts provided in the `ng-dev` command might use local `git`
commands. For such scripts, we keep track of the branch that
has been checked out before the command has been invoked.

We do this so that we can later (upon command completion)
restore back to the original branch. We do not want to
leave the Git repository in a dirty state.

It looks like this logic currently only deals with branches
but does not work properly when a command is invoked from
a detached head. We can make it work by just checking out
the previous revision (if no branch is checked out).

PR Close angular#37737
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker area: dev-infra Issues related to Angular's own dev infra (build, test, CI, releasing) cla: yes target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants