Bump dawidd6/action-download-artifact from 20 to 21#340
Open
dependabot[bot] wants to merge 27 commits into
Open
Bump dawidd6/action-download-artifact from 20 to 21#340dependabot[bot] wants to merge 27 commits into
dependabot[bot] wants to merge 27 commits into
Conversation
Push now calls installCommitIdHook() early in the flow, ensuring the commit-msg hook is always present without requiring a separate manual step. The install is idempotent — it skips the write when the hook is already up-to-date. The stale warning suggesting users run install-commit-id-hook manually is removed. Closes git-jaspr-39h commit-id: If2ec2508
Auto-merge now reuses a cached clone inside .git/jaspr/automerge/ instead of creating a fresh temp directory each time. On subsequent runs it fetches instead of cloning, avoiding redundant network and disk I/O. A file lock (.git/jaspr/automerge.lock) prevents concurrent auto-merge processes from colliding. Closes git-jaspr-9hl commit-id: I128274c1
Show git clone/fetch progress on stderr during auto-merge setup via a new showStderr toggle on CliGitClient, replacing the heartbeat polling message. Pass the user's theme through to the status display so the auto-merge polling loop renders in color. Closes git-jaspr-290 commit-id: I28fec58d
Always pass --allow-empty / setAllowEmpty(true) in both CliGitClient and JGitClient commit methods so empty commits are never rejected. Add an `empty` property to the test DSL so tests can create empty commits declaratively. commit-id: Ia9144a37
CliGitClient: add --allow-empty to cherry-pick so it doesn't fail on commits with no file changes. JGitClient: detect when cherry-pick silently skips an empty commit (HEAD doesn't advance despite Ok status) and create the commit manually with allowEmpty. Use noVerify to prevent the commit-msg hook from adding a duplicate commit-id footer. Fixes git-jaspr-78b commit-id: I2d842b88
When commits exist in multiple named stacks, jaspr now explains the ambiguity instead of silently falling through. The status display shows a warning with the conflicting stack names. The push prompt includes the conflicting names as suggestions alongside commit-based candidates so the user can pick an existing stack or create a new one. suggestStackNames now returns a StackNameSuggestions type that carries both candidates and any ambiguous stack names. The push error message for missing stack names also distinguishes ambiguity from not-found. Fixes git-jaspr-37l commit-id: I2ed45ef5
Narrow the working directory clean check to only consider tracked file changes (staged, modified, deleted, conflicting), ignoring untracked files which are not affected by push's commit rewriting. Rename the interface method to isWorkingDirectoryCleanIgnoringUntracked to make the behavior explicit. Requested by Clark Perkins. commit-id: Ib3cf569f
Always pass --autosquash to git rebase so fixup/squash commits are automatically processed. On git >= 2.44 this works directly; on older versions falls back to --interactive with GIT_SEQUENCE_EDITOR=true to suppress the editor. commit-id: I0cd0f7a8
Shorter name that doesn't expose implementation detail. commit-id: Ia289b29f
NavState data class (sourceBranch, savedTip, divergePoint) persisted as .git/jaspr/nav-state.json. Read/write/clear methods on GitJaspr plus staleness detection (state exists but HEAD is not detached). commit-id: Icd243b68
Navigate down N commits in the stack (toward the target branch) or jump to the bottom. Detaches HEAD and records nav state so the session can be resumed with future up/top commands. Subsequent down commands within a session preserve the original source branch and saved tip. commit-id: I9ceae3f9
Cherry-pick commits from the saved stack above HEAD to move back up. jaspr up [N] replays N commits and stays in the nav session. jaspr top replays all remaining commits, updates the source branch ref, checks it out, and ends the session. commit-id: I2d1954ad
Wipes navigation state file. No-op with a message if no state exists. Stale state warnings were already integrated into down/bottom commands. commit-id: I61423d6d
Interactively select a stack commit and create a fixup commit targeting it. Uses fzf for fuzzy selection with numbered-list fallback. Requires staged changes. The fixup is folded in on the next jaspr rebase (which has --autosquash enabled). commit-id: I018de68b
Detects whether a rebase or cherry-pick is in progress and runs the appropriate --continue command. Prefers rebase over cherry-pick when both are somehow in progress. Prints a message when nothing is active. commit-id: Id56b27b2
When jaspr clean deletes remote branches, it now also removes local branches whose upstream matched a deleted remote branch AND whose tip equals the remote tracking ref. Skips the currently checked-out branch. Local branches are identified before the remote push so tracking refs are still available for comparison. commit-id: I548f8215
installCommitIdHook now uses git rev-parse --git-common-dir to find the hooks directory instead of assuming .git/hooks. This correctly handles git worktrees where .git is a file pointing to the main repo. commit-id: Icf9840f3
Expanded the rebase TODO header to cover all common operations (reorder, drop, squash, edit) with concise instructions. Added jaspr reorder as an alias for jaspr edit for discoverability. commit-id: I2b0c1c6a
Filters the stack list to only show stacks authored by the current user (matched by git user.name and user.email). Also shows the author name on each stack when listing all stacks. commit-id: I2b53ab13
jaspr stack delete now removes local branches that tracked the deleted remote stack branch when their tip matches the remote tip. Skips the current branch. Remaining tracking branches (divergent tip or current branch) have their upstream unset as before. commit-id: Iab29cac7
Rebases all local jaspr-managed branches onto the latest target branch. Uses a temporary worktree for non-checked-out branches with topological ordering (shallowest first) and commit mapping to avoid duplicating shared commits across overlapping branches. The current branch is rebased last, using cherry-pick when it shares commits with already- rebased branches to maintain commit identity. Conflicts cause the branch (and its dependents) to be skipped with a warning. commit-id: Id0e44357
Replace the old NavState (headBeforeDetachSha + divergePoint bookends) with a full stack of StackEntry(sha, commitId) and a cursorIndex. This enables reconciliation between nav operations: detecting inserted commits, removed commits (hard reset), and amended commits by comparing Commit-Ids against the actual git state. Nav down/bottom now build the initial stack on first call and reconcile on subsequent calls. Nav up/top cherry-pick from the replay queue (above cursor) and update SHAs immediately after each cherry-pick. commit-id: I5916211d
Tests for the three key reconciliation scenarios: - New commit during nav session: inserted into the stack - Hard reset during nav session: removed commits move to replay queue - Amend during nav session: SHA updated, amended version used on replay commit-id: I52e5aac4
Drops the HEAD commit(s) from the stack. During a nav session, the dropped commits are removed entirely from the tracked stack (unlike a hard reset, which moves them to the replay queue). Without a nav session, behaves like git reset --hard HEAD~n. commit-id: If5d9dd83
Adding an interactive rebase while in detached HEAD with nav state would corrupt the navigation. The guard checks for both conditions and directs the user to jaspr top or jaspr nav clear first. commit-id: I8920d803
RandomAccessFile construction, lock.release(), and lockFile.close() in autoMerge were flagged as blocking calls in a non-blocking context. commit-id: I5feedbfb
Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 20 to 21. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](dawidd6/action-download-artifact@8305c0f...b6e2e70) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-version: '21' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
dependabot
Bot
added
dependencies
dependabot
Bot
added
the
github_actions
Test Results300 tests 300 ✅ 1m 25s ⏱️ Results for commit 412c345. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bumps dawidd6/action-download-artifact from 20 to 21.
Release notes
Sourced from dawidd6/action-download-artifact's releases.
Commits
b6e2e70node_modules: update (#405)1708cb3Download artifacts in creation order (#398)00b585abuild(deps): bump filesize from 11.0.16 to 11.0.17 (#404)0414c42build(deps): bump@actions/corefrom 3.0.0 to 3.0.1 (#401)c802aadbuild(deps): bump@actions/githubfrom 9.1.0 to 9.1.1 (#400)ef06691build(deps): bump fast-xml-parser from 5.5.7 to 5.7.1 (#402)026702ebuild(deps): bump filesize from 11.0.15 to 11.0.16 (#399)09d0677build(deps): bump@actions/githubfrom 9.0.0 to 9.1.0 (#396)You can trigger a rebase of this PR by commenting
@dependabot rebase.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebasewill rebase this PR@dependabot recreatewill recreate this PR, overwriting any edits that have been made to it@dependabot show <dependency name> ignore conditionswill show all of the ignore conditions of the specified dependency@dependabot ignore this major versionwill close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor versionwill close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependencywill close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)