From c4d933857177bec9925a3cda55135ab76f41242b Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 01:11:09 +0100 Subject: [PATCH 1/6] magit: Adjust key binding for use of Transient --- init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.el b/init.el index 7a6380c..518dca1 100644 --- a/init.el +++ b/init.el @@ -98,7 +98,7 @@ (use-package magit :defer t :bind (("C-x g" . magit-status) - ("C-x M-g" . magit-dispatch-popup)) + ("C-x M-g" . magit-dispatch)) :config (magit-add-section-hook 'magit-status-sections-hook 'magit-insert-modules From 56e282c4fa0616067bdb4ccfcef6b0a9e5635ead Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Sun, 17 Feb 2019 01:14:32 +0100 Subject: [PATCH 2/6] transient: Set submodule.transient.info-path --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 6e03bfa..230303b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,6 +50,7 @@ [submodule "transient"] path = lib/transient url = git@github.com:magit/transient.git + info-path = docs [submodule "treepy"] path = lib/treepy url = git@github.com:volrath/treepy.el.git From 1c1f49b06cf2e65b5d951dac896dd0aa657bc400 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:12:07 +0200 Subject: [PATCH 3/6] Update 12 drones Update borg to v3.1.0-3-ga87d9a1 Update dash to 2.15.0-12-g1549860 Update diff-hl to 1.8.6 Update emacsql to 3.0.0-9-g5ebd12b Update epkg to v3.2.0-3-g408d46a Update ghub to v3.2.0-11-gc7ca678 Update hydra to 0.14.0-44-gacb6985 Update magit to v2.90.1-553-g68840e6da Update magit-popup to v2.13.0 Update transient to v0.1.0-58-gf2314ba Update use-package to 2.4-14-g0ee88b5 Update with-editor to v2.8.1-2-g38df9bf --- lib/borg | 2 +- lib/dash | 2 +- lib/diff-hl | 2 +- lib/emacsql | 2 +- lib/epkg | 2 +- lib/ghub | 2 +- lib/hydra | 2 +- lib/magit | 2 +- lib/magit-popup | 2 +- lib/transient | 2 +- lib/use-package | 2 +- lib/with-editor | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/borg b/lib/borg index 4ffec24..a87d9a1 160000 --- a/lib/borg +++ b/lib/borg @@ -1 +1 @@ -Subproject commit 4ffec24967ba805be2b2f1750e7cfffb85e26a1f +Subproject commit a87d9a115ad0a1f3c2aa26300691e2a47e0e12b8 diff --git a/lib/dash b/lib/dash index 26f065f..1549860 160000 --- a/lib/dash +++ b/lib/dash @@ -1 +1 @@ -Subproject commit 26f065fd607cdf1a68e7987b9360accc2d0cbfb6 +Subproject commit 15498602f42c19c1b8d7f8768f6b998dfd5b3a22 diff --git a/lib/diff-hl b/lib/diff-hl index 76289d2..84a5fe1 160000 --- a/lib/diff-hl +++ b/lib/diff-hl @@ -1 +1 @@ -Subproject commit 76289d24c61fac501d955a8419b5fdf7debddd5f +Subproject commit 84a5fe1900af2e5cc522f02749804f0d9f094bbf diff --git a/lib/emacsql b/lib/emacsql index 59147c4..5ebd12b 160000 --- a/lib/emacsql +++ b/lib/emacsql @@ -1 +1 @@ -Subproject commit 59147c4cdfd18dc2736a6502a3283564ab5c1457 +Subproject commit 5ebd12b6ffaa9fbadefe8518eab07a028bbaf7c1 diff --git a/lib/epkg b/lib/epkg index 4243b36..408d46a 160000 --- a/lib/epkg +++ b/lib/epkg @@ -1 +1 @@ -Subproject commit 4243b363d038b28650479b23949cb7dfd319542b +Subproject commit 408d46a9d041b516e9fda0414058a287dfef37fb diff --git a/lib/ghub b/lib/ghub index 3566dc6..c7ca678 160000 --- a/lib/ghub +++ b/lib/ghub @@ -1 +1 @@ -Subproject commit 3566dc6e18d61455060a96deb70779c91f079c62 +Subproject commit c7ca6780bcd4d00d22e668e74b25f865ba892a45 diff --git a/lib/hydra b/lib/hydra index 9c4a471..acb6985 160000 --- a/lib/hydra +++ b/lib/hydra @@ -1 +1 @@ -Subproject commit 9c4a4711bc78364e114acbbcf484a60669d02d78 +Subproject commit acb69859f3dde8d6924587f39997320256bdd85d diff --git a/lib/magit b/lib/magit index 8b6c399..68840e6 160000 --- a/lib/magit +++ b/lib/magit @@ -1 +1 @@ -Subproject commit 8b6c39999f0654601058bcae79b9fffe44696a09 +Subproject commit 68840e6da97fd35ac41c6f007c1c22dde62a7a6a diff --git a/lib/magit-popup b/lib/magit-popup index 8eaa0be..4250c3a 160000 --- a/lib/magit-popup +++ b/lib/magit-popup @@ -1 +1 @@ -Subproject commit 8eaa0becc2370484a432a8a19f40ce5e8d0f1642 +Subproject commit 4250c3a606011e3ff2477e3b5bbde2b493f3c85c diff --git a/lib/transient b/lib/transient index 0ad64dd..f2314ba 160000 --- a/lib/transient +++ b/lib/transient @@ -1 +1 @@ -Subproject commit 0ad64ddc5db466fb3bcac67b931b30393cdbc0a5 +Subproject commit f2314ba2a4ac3412a8339707a3ca6d810ea66f6f diff --git a/lib/use-package b/lib/use-package index 1273166..0ee88b5 160000 --- a/lib/use-package +++ b/lib/use-package @@ -1 +1 @@ -Subproject commit 12731665e068a68883bdb280e9844dbfd14e5626 +Subproject commit 0ee88b5cac41acf974c4bedb8859931ead8bfc79 diff --git a/lib/with-editor b/lib/with-editor index 9dd9f17..38df9bf 160000 --- a/lib/with-editor +++ b/lib/with-editor @@ -1 +1 @@ -Subproject commit 9dd9f176d96abc60365369de6d08c26c414ef1f3 +Subproject commit 38df9bfc2227bcb7ac4899c83a03756d5f171450 From c4a63984d459213ea04c91d6f6c1f973a4b97468 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:12:45 +0200 Subject: [PATCH 4/6] Remove magit-popup Magit uses transient instead of magit-popup now. --- .gitmodules | 3 --- lib/magit-popup | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/magit-popup diff --git a/.gitmodules b/.gitmodules index 230303b..18b1410 100644 --- a/.gitmodules +++ b/.gitmodules @@ -41,9 +41,6 @@ url = git@github.com:magit/magit.git recursive-byte-compile = true info-path = Documentation -[submodule "magit-popup"] - path = lib/magit-popup - url = git@github.com:magit/magit-popup.git [submodule "packed"] path = lib/packed url = git@github.com:emacscollective/packed.git diff --git a/lib/magit-popup b/lib/magit-popup deleted file mode 160000 index 4250c3a..0000000 --- a/lib/magit-popup +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4250c3a606011e3ff2477e3b5bbde2b493f3c85c From 36127ed917470c36e96e8a61c90592d6c95958c0 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:17:47 +0200 Subject: [PATCH 5/6] Remove hydra Transient no longer depends on the lv library from hydra. --- .gitmodules | 3 --- lib/hydra | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/hydra diff --git a/.gitmodules b/.gitmodules index 18b1410..1524823 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,9 +33,6 @@ [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git -[submodule "hydra"] - path = lib/hydra - url = git@github.com:abo-abo/hydra.git [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git diff --git a/lib/hydra b/lib/hydra deleted file mode 160000 index acb6985..0000000 --- a/lib/hydra +++ /dev/null @@ -1 +0,0 @@ -Subproject commit acb69859f3dde8d6924587f39997320256bdd85d From 3a33910b94298e48b7dae8e83a7204a1f61fa8d5 Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Fri, 19 Apr 2019 21:19:51 +0200 Subject: [PATCH 6/6] Assimilate libgit e85e02a --- .gitmodules | 4 ++++ lib/libgit | 1 + 2 files changed, 5 insertions(+) create mode 160000 lib/libgit diff --git a/.gitmodules b/.gitmodules index 1524823..c0e93a1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,6 +33,10 @@ [submodule "graphql"] path = lib/graphql url = git@github.com:vermiculus/graphql.el.git +[submodule "libgit"] + path = lib/libgit + url = git@github.com:magit/libegit2.git + build-step = make [submodule "magit"] path = lib/magit url = git@github.com:magit/magit.git diff --git a/lib/libgit b/lib/libgit new file mode 160000 index 0000000..e85e02a --- /dev/null +++ b/lib/libgit @@ -0,0 +1 @@ +Subproject commit e85e02ab3bfb6bf43c361bc4e78dd5b5ff93bccc