jj log causes branch to disappear

[TheodoreEhrenborg]

I make a branch and push it. Then I run jj log, and it says

Abandoned 11 commits that are no longer reachable.
Rebased 1 descendant commits off of commits rewritten from git

And my branch has vanished locally. jj git fetch doesn't get it from github either

Full details:

╰─>$ jj bookmark c frozen_for_ci_v0.84.0 -r @-
Created 1 bookmarks pointing to lspmnkww 40013b4e frozen_for_ci_v0.84.0 | Update Cargo.lock
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:25:19]
╰─>$ jj git push
Warning: Refusing to create new remote bookmark frozen_for_ci_v0.84.0@origin
Hint: Use --allow-new to push new bookmark. Use --remote to specify the remote to push to.
Nothing changed.
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:25:21]
╰─>$ jj git push --allow-new 
Changes to push to origin:
  Add bookmark frozen_for_ci_v0.84.0 to 40013b4ef268
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:25:25]─[D:1.228]
╰─>$ jj log
Abandoned 11 commits that are no longer reachable.
Rebased 1 descendant commits off of commits rewritten from git
Working copy  (@) now at: kqywzznu 96ed731c (empty) (no description set)
Parent commit (@-)      : nrnzxznq c02859f5 main@upstream | fixup: Skip key transparency tests in Android emulator tests
Added 0 files, modified 5 files, removed 2 files
Done importing changes from the underlying Git repo.
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:25:37]─[D:2.354]
╰─>$ jj new frozen_for_ci_v0.84.0
Error: Revision `frozen_for_ci_v0.84.0` doesn't exist
Hint: Did you mean `frozen_for_ci`?
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:27:17]
╰─>$ jj new frozen_for_ci_v0.84.0@origin
Error: Revision `frozen_for_ci_v0.84.0@origin` doesn't exist
Hint: Did you mean `frozen_for_ci`, `frozen_for_ci@git`, `frozen_for_ci@origin`?

It's possible that there's a process running git status every so often (I'm using Emacs, and I'm not actively using magit but it might still be running)

Similar effect as #7248, but I'm not deleting any tags

╰─>$ jj --version
jj 0.34.0

[TheodoreEhrenborg]

A few more details:

• It seems to only trigger after I've jj git pushed the branch
• Even if I git checkout the branch, after I push and run jj log, the branch disappears according to both jj and git
• I can still get back the commit (but not the branch) by jj new <commit hash>

╰─>$ git checkout frozen_for_ci_v0.84.0
Switched to branch 'frozen_for_ci_v0.84.0'
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:33:51]
╰─>$ jj log
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:33:53]─[D:0.867]
╰─>$ jj git push -b frozen_for_ci_v0.84.0 --allow-new
Changes to push to origin:
  Add bookmark frozen_for_ci_v0.84.0 to 40013b4ef268
┬─[theo@lutfisk:~/p/libsignal]─[Tue Oct 14 11:33:57]─[D:1.249]
╰─>$ jj log
Abandoned 11 commits that are no longer reachable.
Rebased 1 descendant commits off of commits rewritten from git
Working copy  (@) now at: sussrppq 540692ef (empty) (no description set)
Parent commit (@-)      : nrnzxznq c02859f5 main@upstream | fixup: Skip key transparency tests in Android emulator tests
Added 0 files, modified 5 files, removed 2 files
Done importing changes from the underlying Git repo.

[bnjmnt4n]

Do you have any additional Git configuration which might change the default push behaviour?

[TheodoreEhrenborg]

I don't think so? In home-manager my configuration is:

  jujutsu = {
    enable = true;
    settings.user = {
      name = "Theodore Ehrenborg";
      email = "[email protected]";
    };
    package = pkgs-hm-unstable-lite.jujutsu;
    settings.ui = {
      default-command = "show";
    };
  };
  git = {
    enable = true;
    userEmail = "[email protected]";
    userName = "TheodoreEhrenborg";
    lfs.enable = true;
    difftastic = {
      enable = false;
    };
  };

Although the issue does seem to be specific to that particular repo. I can't reproduce in another workspace. Tomorrow I'll try deleting that whole repo and recloning it

Another thing is that the libsignal repo is quite large, so maybe that somehow messes with jj? 🤷‍♂️

[jennings]

The config would be in the individual repository. What do you get from this command?

git config get --all remote.origin.fetch

[TheodoreEhrenborg]

Thanks, that was it 🎉

My config looked like this:

╰─>$ jj git remote list
origin [email protected]:Beneficial-AI-Foundation/libsignal.git
upstream https://github.com/signalapp/libsignal/
┬─[theo@lutfisk:~/p/libsignal]─[Wed Oct 15 09:42:08]
╰─>$ git config get --all remote.origin.fetch
+refs/heads/main:refs/remotes/origin/main
┬─[theo@lutfisk:~/p/libsignal]─[Wed Oct 15 09:42:11]
╰─>$ git config get --all remote.upstream.fetch
+refs/heads/*:refs/remotes/upstream/*

The origin config was limited to just main

I ran git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*' (thanks Claude), and the issue has gone away

So I guess since git was only fetching the one branch from origin, whenever jj talked to origin, it would throw away all other branches?