diff options
| -rw-r--r-- | Annex/Environment.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Annex/Environment.hs b/Annex/Environment.hs index f22c5f2d4..4b8d38464 100644 --- a/Annex/Environment.hs +++ b/Annex/Environment.hs @@ -56,10 +56,12 @@ checkEnvironmentIO = #endif {- Runs an action that commits to the repository, and if it fails, - - sets user.email to a dummy value and tries the action again. -} + - sets user.email and user.name to a dummy value and tries the action again. -} ensureCommit :: Annex a -> Annex a ensureCommit a = either retry return =<< tryAnnex a where retry _ = do - setConfig (ConfigKey "user.email") =<< liftIO myUserName + name <- liftIO myUserName + setConfig (ConfigKey "user.name") name + setConfig (ConfigKey "user.email") name a diff --git a/debian/changelog b/debian/changelog index 52f20250f..1650a07ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -30,6 +30,8 @@ git-annex (5.20140413) UNRELEASED; urgency=medium ~/.config/git-annex/autostart but no longer has a git repository in it. * findref: New command, like find but shows files in a specified git ref. * webapp: Fix UI for removing XMPP connection. + * When init detects that git is not configured to commit, and sets + user.email to work around the problem, also make it set user.name. -- Joey Hess <joeyh@debian.org> Fri, 11 Apr 2014 21:33:35 -0400 |