ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity
3897 commits 74 branches 27 tags 39 MiB
Commit graph

3 commits

Author SHA1 Message Date
Ilya Grigoriev
6fa8a25839 cli templates: include branches in short commit description 
They are shown next to the change and commit id, since they are other names the
commit can be referred by. 

The description is separated from the branches by a ` | ` when there are
branches, so that one can tell the branches from the description without color.

The result looks like this: ![image](https://github.com/martinvonz/jj/assets/4123047/a38aff7b-2b47-49e6-8461-c42e8eb535a4)
 2023-08-10 20:58:40 -07:00
Yuya Nishihara
b2101d15c8 cli: detect .git symlink as a colocated workspace 
Maybe we could load GitBackend without resolving .git symlink, but that would
introduce more subtle bugs. Instead, we calculate the expected Git workdir path
from the canonical ".git" path.

Fixes #2011
 2023-08-10 14:53:54 +09:00
Martin von Zweigbergk
0075174308 tests: move tests/ under cli/ so they're run again 
Thanks to @ilyagr for noticing that they should be moved.
 2023-08-05 06:18:59 +00:00
Renamed from tests/test_init_command.rs (Browse further)