summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 17:56:50 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-09-21 17:56:50 -0400
commit9e5dd34879e932129f39f000cd841df71afef08e (patch)
treece86d22be616e14dbf985cbcfc8331eace6a2d31
parent44a8756b7bcf1f9acf2fa4f40edb8566944d8489 (diff)
devblog
-rw-r--r--doc/devblog/day_415__catching_up.mdwn19
1 files changed, 19 insertions, 0 deletions
diff --git a/doc/devblog/day_415__catching_up.mdwn b/doc/devblog/day_415__catching_up.mdwn
new file mode 100644
index 000000000..d2828a0c8
--- /dev/null
+++ b/doc/devblog/day_415__catching_up.mdwn
@@ -0,0 +1,19 @@
+Catching up on backlog today. I hope to be back to a regular work schedule
+now. Unanswered messages down to 156. A lot of time today spent answering
+questions.
+
+There were several problems involving git branches with slashes in their
+name, such as "foo/bar" (but not "origin/master" or "refs/heads/foo").
+Some branch names based on such a branch would take only the "bar" part.
+In `git annex sync`, this led to perhaps merging "foo/bar" into "other/bar"
+or "bar". And the adjusted branch code was entirely broken for such
+branches. I've fixed it now.
+
+Also made `git annex addurl` behave better when the file it wants to
+add is gitignored.
+
+Thinking about implementing `git annex copy --from A --to B`.
+It does not seem *too* hard to do that, at least with a temp file
+used inbetween. See [[todo/transitive_transfers]].
+
+Today's work was sponsored by Thomas Hochstein on Patreon.