aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch.mdwn2
-rw-r--r--doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch/comment_1_d5e90cf5edf189bb023deb46b5ffe96c._comment11
-rw-r--r--doc/git-annex-test.mdwn2
-rw-r--r--doc/git-annex-testremote.mdwn2
-rw-r--r--doc/tips/ZSH_completion/comment_2_182c13292016baf46d8f53a306cb4b05._comment15
-rw-r--r--stack.yaml1
6 files changed, 33 insertions, 0 deletions
diff --git a/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch.mdwn b/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch.mdwn
index 442e17242..3d1b38556 100644
--- a/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch.mdwn
+++ b/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch.mdwn
@@ -19,3 +19,5 @@ The only way to rectify this I can find is `git checkout` - but that means I hav
### What version of git-annex are you using? On what operating system?
git-annex version: 6.20171026-gd451d333d (standalone binary) on Debian stretch.
+
+[[!meta title="v6 get/drop make git think files are changed"]]
diff --git a/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch/comment_1_d5e90cf5edf189bb023deb46b5ffe96c._comment b/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch/comment_1_d5e90cf5edf189bb023deb46b5ffe96c._comment
new file mode 100644
index 000000000..d635819d7
--- /dev/null
+++ b/doc/bugs/Unchanged_files_are_detected_as_modified_in_unlocked_branch/comment_1_d5e90cf5edf189bb023deb46b5ffe96c._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2017-11-09T15:56:41Z"
+ content="""
+This is one of the primary known problems with v6 mode. On the page
+[[todo/smudge]] that collects all such issues, it's the second item.
+Basically, when git-annex gets/drops the content of the file, it
+updates the work tree file, and so git thinks the file has changed.
+Currently the best way to deal with it is to run `git add` on the file.
+"""]]
diff --git a/doc/git-annex-test.mdwn b/doc/git-annex-test.mdwn
index 773f7404e..8d18f82e7 100644
--- a/doc/git-annex-test.mdwn
+++ b/doc/git-annex-test.mdwn
@@ -29,6 +29,8 @@ framework. Pass --help for details about those.
[[git-annex]](1)
+[[git-annex-testremote]](1)
+
# AUTHOR
Joey Hess <id@joeyh.name>
diff --git a/doc/git-annex-testremote.mdwn b/doc/git-annex-testremote.mdwn
index a6793066c..df3c8ac50 100644
--- a/doc/git-annex-testremote.mdwn
+++ b/doc/git-annex-testremote.mdwn
@@ -36,6 +36,8 @@ and exporttree disabled and enabled.
[[git-annex]](1)
+[[git-annex-test]](1)
+
# AUTHOR
Joey Hess <id@joeyh.name>
diff --git a/doc/tips/ZSH_completion/comment_2_182c13292016baf46d8f53a306cb4b05._comment b/doc/tips/ZSH_completion/comment_2_182c13292016baf46d8f53a306cb4b05._comment
new file mode 100644
index 000000000..9fd7b628f
--- /dev/null
+++ b/doc/tips/ZSH_completion/comment_2_182c13292016baf46d8f53a306cb4b05._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 2"""
+ date="2017-11-09T16:11:10Z"
+ content="""
+Well, the code that generates the zsh completions could
+always be improved.
+<https://github.com/pcapriotti/optparse-applicative/issues>
+
+I don't really understand why completing options before filenames makes
+it unusable. It means that "git-annex tabtabtab" cycles through options
+first, but if you type part of the filename tab will complete the rest.
+It does seem that someone else agrees with you though, as they filed
+this issue: <https://github.com/pcapriotti/optparse-applicative/issues/173>
+"""]]
diff --git a/stack.yaml b/stack.yaml
index d84c4682e..8f1f1dabd 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -21,6 +21,7 @@ extra-deps:
- bloomfilter-2.0.1.0
- torrent-10000.1.1
- yesod-default-1.2.0
+- optparse-applicative-0.14.0.0
explicit-setup-deps:
git-annex: true
resolver: lts-9.9