mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2024-05-30 13:26:44 -04:00
commit adf17f5038
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 236 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/todo/make_annex___34__respect__34___.git__47__hooks__47__prepare-commit-msg/comment_7_a766358f9d5635589379d9be16ef8092._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 7"
date="2024-05-30T14:29:43Z"
content="""
fixed in [10.20240129-86-g3475b09c3e AKA 10.20240227~29](https://git.kitenet.net/index.cgi/git-annex.git/commit/?id=3475b09c3e93ae7e5f21de02e7ada8f460e490a4) --[[yarikoptic]]
"""]]

41
doc/todo/make_annex___34__respect__34___.git__47__hooks__47__prepare-commit-msg/comment_8_b89d83fbf3f8a1e88fa607f01b182d0f._comment Normal file
View file

@ -0,0 +1,41 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 8"
date="2024-05-30T14:34:32Z"
content="""
FWIW the trick with `.git/last-commit-msg` did not really work for me in direct use of git-annex as I guess annex introduces changes to git-annex when I do `git-annex add` first, so it takes then PRIOR commit message:
```
❯ git annex add random2
(recording state in git...)
add random2
ok
(recording state in git...)
❯ git commit -a
[master 16107604] Will be committing changes to following files: random2
1 file changed, 1 insertion(+)
create mode 120000 random2
❯ git show git-annex
commit dfb41b9b170e4d504e1e494538362e20bd73943a (git-annex)
Author: Yaroslav Halchenko <debian@onerussian.com>
Date: Thu May 30 10:31:46 2024 -0400
Will be committing changes to following files: random
diff --git a/a37/1c8/MD5E-s1000--288b6b2b44800acf433b76dc5889695c.log b/a37/1c8/MD5E-s1000--288b6b2b44800acf433b76dc5889695c.log
new file mode 100644
index 00000000..4a3787e6
--- /dev/null
+++ b/a37/1c8/MD5E-s1000--288b6b2b44800acf433b76dc5889695c.log
@@ -0,0 +1 @@
+1717079506s 1 fff52b70-2aa4-4d16-8377-97fee7b2de1c
❯ cat .git/last-commit-msg
Will be committing changes to following files: random2
❯ git lg HEAD^^..HEAD
* 16107604 - (HEAD -> master) Will be committing changes to following files: random2 (3 minutes ago) [Yaroslav Halchenko]
* d4840167 - Will be committing changes to following files: random (4 minutes ago) [Yaroslav Halchenko]
```
"""]]