diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-04-03 12:18:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-04-03 12:18:38 -0400 |
| commit | 216ad1a4d3434306cf3338217fbcf5cbe6e1c8d6 (patch) | |
| tree | 624893449be8c9872fe1b1ae237e53f5fcba4270 | |
| parent | 623d612ebca0d4a231652918155c794afa43162b (diff) | |
Clear up short option confusion between --from and --force (-f is now --from, and there is no short option for --force).
| -rw-r--r-- | Options.hs | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Options.hs b/Options.hs index 10c3714e4..31b73e25a 100644 --- a/Options.hs +++ b/Options.hs @@ -20,7 +20,7 @@ type Option = OptDescr (Annex ()) commonOptions :: [Option] commonOptions = - [ Option ['f'] ["force"] (NoArg (setforce True)) + [ Option [] ["force"] (NoArg (setforce True)) "allow actions that may lose annexed data" , Option ['F'] ["fast"] (NoArg (setfast True)) "avoid slow operations" diff --git a/debian/changelog b/debian/changelog index e504bd8f6..71ea599cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ git-annex (0.20110402) UNRELEASED; urgency=low * Unused files on remotes, particulary special remotes, can now be identified and dropped, by using "--from remote" with git annex unused and git annex dropunused. + * Clear up short option confusion between --from and --force (-f is now + --from, and there is no short option for --force). -- Joey Hess <joeyh@debian.org> Sat, 02 Apr 2011 13:45:54 -0400 diff --git a/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn b/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn index b57471e5f..3bda45149 100644 --- a/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn +++ b/doc/bugs/git_annex_copy_-f_REMOTE_._doesn__39__t_work_as_expected.mdwn @@ -12,3 +12,7 @@ which gives me I would have expected that since *--to* is the same as *-t* and *--from* is the same as *-f* as the in program documentation suggests. But *-f* clashes with the force command, I would suggest that the short form of *--force* be changed to *-F* and possibly rename the *Fast* commands to *Quick* and use *-Q* as the short form of the *Quick* operations. I didn't try the *-f* option with the move command, but it probably suffers from the same issue. It's probably better to avoid clashing short forms of command options. I guess this issue is just a documentation issue and a minor interface change if needed and not a bug of git-annex, but a quirk. + +> Yeah, -f needs to be from; -F was already --fast. I have made --force not +> have any short option abbreviation, I think it's entirely reasonable to +> avoid fat-fingering an option that can lose data. [[done]] --[[Joey]] |