Yuya Nishihara aaa2025dfc git: on fetch, pin visible untracked remote refs ... This implements the other workaround described in 57167cefda "git: on import_refs(), don't abandon ancestors of newly fetched refs": > I think there are two ways to fix the problem: > a. pin non-tracking remote branches just like local refs > b. pin newly fetched refs in addition to local refs > This patch implements (b) because it's simpler and more obvious that the > fetched commits would never be abandoned immediately. The idea of (a) is that untracked remote branches are independent read-only refs, and read-only branches shouldn't be rewritten implicitly. Once the branch gets rewritten or abandoned by user, these remote refs will be hidden, and won't be pinned anymore. Since (a) effectively supersedes (b), this patch also removes the original workaround. Fixes #3495		2024-04-14 11:38:21 +09:00
..
benches
gen-protos	Use { workspace = true } to appease VS Code's Cargo.toml parser	2023-08-22 21:38:53 -07:00
proc-macros	cargo: mark the jj-lib-proc-macros crate for publish	2024-03-06 20:35:38 -08:00
src	git: on fetch, pin visible untracked remote refs	2024-04-14 11:38:21 +09:00
tests	git: on fetch, pin visible untracked remote refs	2024-04-14 11:38:21 +09:00
testutils	compile integration tests as a single binary	2024-02-06 18:19:41 -08:00
Cargo.toml	test_conflicts and test_resolve_command: use indoc! to indent conflict markers in tests	2024-03-22 23:27:25 -07:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00