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

Enable upstream tracking #32

Merged
merged 12 commits into from
Oct 30, 2024
Merged

Commits on Sep 15, 2024

  1. feat: Set --track when creating worktree, if there is an upstream

    Currently, the user experience when creating worktrees that track remote
    upstreams are not straight forward. This patch improves it by allowing the
    user to pass any ref to the --track option of git.
    rbmarliere committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    46cd191 View commit details
    Browse the repository at this point in the history
  2. feat: Enable user to get "out" of a worktree

    This is especially useful when creating or deleting a worktree, to avoid
    deleting errors if the user is within the to-be deleted worktree or
    unintended nested paths when creating.
    rbmarliere committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    73e64c9 View commit details
    Browse the repository at this point in the history
  3. fix: Rename create_worktree to telescope_create_worktree

    Follow the same naming convention of the main picker.
    rbmarliere committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    4b2854b View commit details
    Browse the repository at this point in the history
  4. fix: Add telescope_create_worktree mappings from the worktree picker

    This means that a user can create a worktree when there is none, so allow
    for an empty worktree list by not returning early if #results == 0.
    rbmarliere committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    0092aa5 View commit details
    Browse the repository at this point in the history
  5. fix: Use non conflicting keymap for delete_worktree

    Other pickers already use <c-d> for scrolling preview and
    telescope-file-browser.nvim use <m-d> for deleting files, so use that for
    consistency.
    rbmarliere committed Sep 15, 2024
    Configuration menu
    Copy the full SHA
    a5b27a2 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. fix: Use refname:short as format in Git.has_branch

    This corrects the output and make unnecessary to make use of :gsub and
    :trim.
    rbmarliere committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    94b6b09 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    409a885 View commit details
    Browse the repository at this point in the history
  3. fix: Disambiguate remote branches

    Currently, if the user chooses a remote branch to checkout, it will be
    created locally with the same name causing it to produce an ambiguous ref
    which git won't be able to use as upstream to track. This defaults the new
    local branch to be prefixed with "local/".
    rbmarliere committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    707f98e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a45a865 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fe4c077 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. Configuration menu
    Copy the full SHA
    314e334 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f6da26 View commit details
    Browse the repository at this point in the history