-
Notifications
You must be signed in to change notification settings - Fork 688
Open
Labels
🐛bugSomething isn't workingSomething isn't working
Description
Steps to Reproduce the Problem
run this script (replace rust-forge with any random repo you have write access to):
set -x
git clone --depth 10 git@github.com:lolbinarycat/rust-forge.git
cd rust-forge
git switch -c bug-repro-1
echo 'aaaaaaaaaaaaa' > test.txt
git add -A
git commit -am 'bug repro'
git push --force --set-upstream origin bug-repro-1
jj git init --git-repo .
jj edit bug-repro-1
echo 'bbbbbbbbbbb' > test.txt
jj git push --bookmark bug-repro-1
jj git fetch
jj bookmark track bug-repro-1@origin
jj bookmark set -r @ bug-repro-1
jj git push --bookmark bug-repro-1
Expected Behavior
bookmark/branch is updated
Actual Behavior
this output:
+ git clone --depth 10 git@github.com:lolbinarycat/rust-forge.git
Cloning into 'rust-forge'...
remote: Enumerating objects: 218, done.
remote: Counting objects: 100% (218/218), done.
remote: Compressing objects: 100% (189/189), done.
remote: Total 218 (delta 34), reused 123 (delta 23), pack-reused 0 (from 0)
Receiving objects: 100% (218/218), 340.84 KiB | 123.00 KiB/s, done.
Resolving deltas: 100% (34/34), done.
+ cd rust-forge
+ git switch -c bug-repro-1
Switched to a new branch 'bug-repro-1'
+ echo aaaaaaaaaaaaa
+ git add -A
+ git commit -am 'bug repro'
[bug-repro-1 9b1bf11] bug repro
1 file changed, 1 insertion(+)
create mode 100644 test.txt
+ git push --force --set-upstream origin bug-repro-1
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 4 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 261 bytes | 261.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), completed with 1 local object.
To github.com:lolbinarycat/rust-forge.git
+ b132bae...9b1bf11 bug-repro-1 -> bug-repro-1 (forced update)
branch 'bug-repro-1' set up to track 'origin/bug-repro-1'.
+ jj git init --git-repo .
Done importing changes from the underlying Git repo.
Setting the revset alias "trunk()" to "master@origin"
Hint: The following remote bookmarks aren't associated with the existing local bookmarks:
master@origin
Hint: Run `jj bookmark track master@origin` to keep local bookmarks updated on future pulls.
Initialized repo in "."
+ jj edit bug-repro-1
Working copy now at: ovmstmnr 9b1bf118 bug-repro-1 | bug repro
Parent commit : szzmwrwo 0a8a3d97 master master@origin | (empty) Merge pull request #772 from Urgau/Urgau-patch-1
+ echo bbbbbbbbbbb
+ jj git push --bookmark bug-repro-1
Changes to push to origin:
Add bookmark bug-repro-1 to c2aed616fe60
Error: Refusing to push a bookmark that unexpectedly moved on the remote. Affected refs: refs/heads/bug-repro-1
Hint: Try fetching from the remote, then make the bookmark point to where you want it to be, and push again.
+ jj git fetch
bookmark: blog_links@origin [new] untracked
bookmark: bug-repro-1@origin [new] untracked
bookmark: ice-issue-triage@origin [new] untracked
bookmark: mem_swap_unsized@origin [new] untracked
bookmark: triage-explain@origin [new] untracked
+ jj bookmark track bug-repro-1@origin
Started tracking 1 remote bookmarks.
bug-repro-1 (conflicted):
+ ovmstmnr?? c2aed616 bug repro
+ ovmstmnr?? 9b1bf118 bug repro
@origin (behind by 1 commits): ovmstmnr?? 9b1bf118 bug repro
+ jj bookmark set -r @ bug-repro-1
Moved 1 bookmarks to ovmstmnr?? c2aed616 bug-repro-1* | bug repro
+ jj git push --bookmark bug-repro-1
Changes to push to origin:
Move sideways bookmark bug-repro-1 from 9b1bf11863ff to c2aed616fe60
Error: object not found - no match for id (9843fc8455c3d89673c6c5d8b1cecbf5694c691f); class=Odb (9); code=NotFound (-3)
Specifications
- Platform: NixOS
- Version:
jj 0.22.0-3268409d2fa8e05c733c5d1e85a695fe843276e2
neongreen-sc
Metadata
Metadata
Assignees
Labels
🐛bugSomething isn't workingSomething isn't working