Includes test tapes for navigation, branch operations, stash operations, help panel, commits, and cursor navigation. Resolved stash conflicts by keeping simpler test versions. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
877 lines
65 KiB
Plaintext
877 lines
65 KiB
Plaintext
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> ./test/e2e/setup-test-repo.sh /tmp/lazygitclj-e2e-reset && cd /tmp/lazygitclj-e2e-reset && bb
|
|
--config /home/ajet/repos/lazygitclj/bb.edn start
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> ./test/e2e/setup-test-repo.sh /tmp/lazygitclj-e2e-reset && cd /tmp/lazygitclj-e2e-reset && bb
|
|
--config /home/ajet/repos/lazygitclj/bb.edn start
|
|
Initialized empty Git repository in /tmp/lazygitclj-e2e-reset/.git/
|
|
[main (root-commit) bcf7fe9] Initial commit
|
|
3 files changed, 3 insertions(+)
|
|
create mode 100644 README.md
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
Switched to a new branch 'feature-branch'
|
|
[feature-branch c24e652] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
Test repo created at /tmp/lazygitclj-e2e-reset
|
|
- main branch with 1 commit
|
|
- feature-branch with 1 extra commit
|
|
- 1 staged file (file2.txt)
|
|
- 1 unstaged file (file1.txt)
|
|
- 1 untracked file (newfile.txt)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ────╔═ Reset Options ════════════════════════╗ │
|
|
│ feature-branch ║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ * main ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
└─────────────────────────║ u - Unstage all staged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ d - Discard all unstaged changes ║ │
|
|
│ bcf7fe9 Initial commit ║ c - Clean untracked files ║ │
|
|
│ ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ────╔═ Reset Options ════════════════════════╗ │
|
|
│ feature-branch ║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ * main ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
└─────────────────────────║ u - Unstage all staged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ d - Discard all unstaged changes ║ │
|
|
│ bcf7fe9 Initial commit ║ c - Clean untracked files ║ │
|
|
│ ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ────╔═ Reset Options ════════════════════════╗ │
|
|
│ feature-branch ║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ * main ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
└─────────────────────────║ u - Unstage all staged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ d - Discard all unstaged changes ║ │
|
|
│ bcf7fe9 Initial commit ║ c - Clean untracked files ║ │
|
|
│ ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ────╔═ Reset Options ════════════════════════╗ │
|
|
│ feature-branch ║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ * main ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
└─────────────────────────║ u - Unstage all staged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ d - Discard all unstaged changes ║ │
|
|
│ bcf7fe9 Initial commit ║ c - Clean untracked files ║ │
|
|
│ ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file2.txt ║ │ +++ b/file2.txt │
|
|
║ M file1.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ────╔═ Reset Options ════════════════════════╗ │
|
|
│ feature-branch ║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ * main ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
└─────────────────────────║ u - Unstage all staged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ d - Discard all unstaged changes ║ │
|
|
│ bcf7fe9 Initial commit ║ c - Clean untracked files ║ │
|
|
│ ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ │ │
|
|
│ │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
└──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file1.txt b/file1.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..2a08f83 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file1.txt │
|
|
║ M file1.txt ║ │ +++ b/file1.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +modified │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file1.txt b/file1.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..2a08f83 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file1.txt │
|
|
║ M file1.txt ║ │ +++ b/file1.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +modified │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file1.txt ║ │ +++ b/file2.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file1.txt ║ │ +++ b/file2.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file1.txt ║ │ +++ b/file2.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚═════════════════════════╔═ Reset Options ════════════════════════╗ │
|
|
┌─ 3 Branches [L] R T ────║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ feature-branch ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ * main ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
│ ║ u - Unstage all staged changes ║ │
|
|
└─────────────────────────║ d - Discard all unstaged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ c - Clean untracked files ║ │
|
|
│ bcf7fe9 Initial commit ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Unstaged all changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ diff --git a/file2.txt b/file2.txt │
|
|
└────────────────────────────┘ │ index a29bdeb..723650f 100644 │
|
|
╔═ 2 Files (3) ══════════════╗ │ --- a/file2.txt │
|
|
║ M file1.txt ║ │ +++ b/file2.txt │
|
|
║ M file2.txt ║ │ @@ -1 +1,2 @@ │
|
|
║ ?? newfile.txt ║ │ line1 │
|
|
║ ║ │ +staged content │
|
|
╚═════════════════════════╔═ Reset Options ════════════════════════╗ │
|
|
┌─ 3 Branches [L] R T ────║ s - Soft reset (uncommit, keep staged) ║ │
|
|
│ feature-branch ║ m - Mixed reset (uncommit, unstage) ║ │
|
|
│ * main ║ h - Hard reset (discard all changes) ║ │
|
|
│ ║ ║ │
|
|
│ ║ u - Unstage all staged changes ║ │
|
|
└─────────────────────────║ d - Discard all unstaged changes ║ │
|
|
┌─ 4 Commits [C] R ───────║ c - Clean untracked files ║ │
|
|
│ bcf7fe9 Initial commit ║ ║ │
|
|
│ ║ esc - Cancel ║ │
|
|
│ ╚════════════════════════════════════════╝ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Discarded unstaged changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ │
|
|
└────────────────────────────┘ │ │
|
|
╔═ 2 Files (1) ══════════════╗ │ │
|
|
║ ?? newfile.txt ║ │ │
|
|
║ ║ │ │
|
|
║ ║ │ │
|
|
║ ║ │ │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
Discarded unstaged changes
|
|
┌─ 1 Status ─────────────────┐ ┌─ 0 Main ─────────────────────────────────────────────────────┐
|
|
│ main → bcf7fe9 │ │ │
|
|
└────────────────────────────┘ │ │
|
|
╔═ 2 Files (1) ══════════════╗ │ │
|
|
║ ?? newfile.txt ║ │ │
|
|
║ ║ │ │
|
|
║ ║ │ │
|
|
║ ║ │ │
|
|
╚════════════════════════════╝ │ │
|
|
┌─ 3 Branches [L] R T ───────┐ │ │
|
|
│ feature-branch │ │ │
|
|
│ * main │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 4 Commits [C] R ──────────┐ │ │
|
|
│ bcf7fe9 Initial commit │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ │ │
|
|
┌─ 5 Stash (0) ──────────────┐ │ │
|
|
│ No stashes │ └──────────────────────────────────────────────────────────────┘
|
|
│ │ ┌─ Command Log ────────────────────────────────────────────────┐
|
|
│ │ │ │
|
|
│ │ │ │
|
|
└────────────────────────────┘ └──────────────────────────────────────────────────────────────┘
|
|
q:quit ?:help h/l:panels j/k:nav spc:stage a:all c:commit p/P:pull/push
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> ./test/e2e/setup-test-repo.sh /tmp/lazygitclj-e2e-reset && cd /tmp/lazygitclj-e2e-reset && bb
|
|
--config /home/ajet/repos/lazygitclj/bb.edn start
|
|
Initialized empty Git repository in /tmp/lazygitclj-e2e-reset/.git/
|
|
[main (root-commit) bcf7fe9] Initial commit
|
|
3 files changed, 3 insertions(+)
|
|
create mode 100644 README.md
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
Switched to a new branch 'feature-branch'
|
|
[feature-branch c24e652] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
Test repo created at /tmp/lazygitclj-e2e-reset
|
|
- main branch with 1 commit
|
|
- feature-branch with 1 extra commit
|
|
- 1 staged file (file2.txt)
|
|
- 1 unstaged file (file1.txt)
|
|
- 1 untracked file (newfile.txt)
|
|
Starting lazygitclj...
|
|
|
|
Goodbye!
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|
|
> ./test/e2e/setup-test-repo.sh /tmp/lazygitclj-e2e-reset && cd /tmp/lazygitclj-e2e-reset && bb
|
|
--config /home/ajet/repos/lazygitclj/bb.edn start
|
|
Initialized empty Git repository in /tmp/lazygitclj-e2e-reset/.git/
|
|
[main (root-commit) bcf7fe9] Initial commit
|
|
3 files changed, 3 insertions(+)
|
|
create mode 100644 README.md
|
|
create mode 100644 file1.txt
|
|
create mode 100644 file2.txt
|
|
Switched to a new branch 'feature-branch'
|
|
[feature-branch c24e652] Feature work
|
|
1 file changed, 1 insertion(+)
|
|
Switched to branch 'main'
|
|
Test repo created at /tmp/lazygitclj-e2e-reset
|
|
- main branch with 1 commit
|
|
- feature-branch with 1 extra commit
|
|
- 1 staged file (file2.txt)
|
|
- 1 unstaged file (file1.txt)
|
|
- 1 untracked file (newfile.txt)
|
|
Starting lazygitclj...
|
|
|
|
Goodbye!
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
────────────────────────────────────────────────────────────────────────────────
|