1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2024-12-16 11:37:01 +02:00
lazygit/pkg/commands/git_commands
Stefan Haller ff8bc91a8e Use remote upstreams of main branches to determine merged status of commits
This solves three problems:

1. When the local main branch is behind its upstream, the merged status of
   commits of a feature branch sitting on origin/main was not correct. This can
   easily happen when you rebase a branch onto origin/main instead of main, and
   don't bother keeping local main up to date.
2. It works when you don't have the main branch locally at all. This could
   happen when you check out a colleague's feature branch that goes off of
   "develop", but you don't have "develop" locally yourself because you normally
   only work on "main".
3. It also works when you work on a main branch itself, e.g. by committing to it
   directly, or by merging a branch locally. These local commits on a main
   branch would previously be shown in green instead of red; this broke with
   910a61dc46.
2023-06-26 09:02:46 +02:00
..
bisect_info.go simplify 2022-03-24 20:14:41 +11:00
bisect.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
branch_loader_test.go show commits against branches 2023-06-01 19:21:24 +10:00
branch_loader.go show commits against branches 2023-06-01 19:21:24 +10:00
branch_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
branch.go show commits against branches 2023-06-01 19:21:24 +10:00
commit_file_loader_test.go Merge loaders package into git_commands package 2022-11-14 18:11:45 +11:00
commit_file_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
commit_loader_test.go Use remote upstreams of main branches to determine merged status of commits 2023-06-26 09:02:46 +02:00
commit_loader.go Use remote upstreams of main branches to determine merged status of commits 2023-06-26 09:02:46 +02:00
commit_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
commit.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
common.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
config.go restore field 2022-01-09 14:09:53 +11:00
custom.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
deps_test.go Refactor interface for ApplyPatch 2023-05-20 20:54:39 +10:00
diff.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
file_loader_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
file_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
file_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
file.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
flow_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
flow.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
git_command_builder_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
git_command_builder.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
patch_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
patch.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
rebase_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
rebase.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reflog_commit_loader_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
reflog_commit_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
remote_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
remote.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
stash_loader_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
stash_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
stash_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
stash.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
status.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
submodule.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
sync_test.go Add --all to "git fetch" command when not fetching a specific remote 2023-06-01 10:13:14 +02:00
sync.go Add --all to "git fetch" command when not fetching a specific remote 2023-06-01 10:13:14 +02:00
tag_loader_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
tag_loader.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
tag.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
version_test.go feat: add GitVersion struct 2022-12-30 20:01:14 +09:00
version.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
working_tree_test.go Construct arg vector manually rather than parse string 2023-05-23 19:49:19 +10:00
working_tree.go Fix discard logic 2023-05-23 20:23:08 +10:00