diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-20 12:23:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-20 12:23:49 -0400 |
| commit | da0bdc1a57d44ecfc7040affed725db4528d359a (patch) | |
| tree | 03d2e38270517161e526c5c6fe196990b958a3ef | |
| parent | dc5ed8d3b677f3c45118f5d5a89ad528ede7b171 (diff) | |
Fix the hook special remote, which bitrotted a while ago.
| -rw-r--r-- | Remote/Hook.hs | 7 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs index ab84533b2..5c761f43b 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -62,13 +62,12 @@ hookEnv k f = Just $ fileenv f ++ keyenv env s v = ("ANNEX_" ++ s, v) keyenv = [ env "KEY" (show k) - , env "HASH_1" hash_1 - , env "HASH_2" hash_2 + , env "HASH_1" (hashbits !! 0) + , env "HASH_2" (hashbits !! 1) ] fileenv Nothing = [] fileenv (Just file) = [env "FILE" file] - [hash_1, hash_2, _rest] = - map takeDirectory $ splitPath $ hashDirMixed k + hashbits = map takeDirectory $ splitPath $ hashDirMixed k lookupHook :: String -> String -> Annex (Maybe String) lookupHook hooktype hook =do diff --git a/debian/changelog b/debian/changelog index 3c977e817..e187d8f6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ git-annex (3.20111212) UNRELEASED; urgency=low * Union merge now finds the least expensive way to represent the merge. * reinject: Add a sanity check for using an annexed file as the source file. * Properly handle multiline git config values. + * Fix the hook special remote, which bitrotted a while ago. -- Joey Hess <joeyh@debian.org> Mon, 12 Dec 2011 01:57:49 -0400 |