4 files changed, 7 insertions, 1 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bd8c0c0..971d220d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ What's new in LuaRocks 3.0
   For example, if you have `/some/dir/lua/5.1/` in your `$LUA_PATH` and
   you are running Lua 5.2, `luarocks.loader` and the `luarocks` command-line
   tool will convert it to `/some/dir/lua/5.2/`.
+* New flag `--temp-key` for `luarocks upload`, allowing you to easily
+  upload rocks into an alternate account without disrupting the
+  stored configuration of your main account.
 * New flag `--dev`, for enabling development-branch sub-repositories.
   This adds support for easily requesting `dev` modules from LuaRocks.org, as in:
   `luarocks install --dev luafilesystem`. The list of URLs configured
diff --git a/src/luarocks/cmd/upload.lua b/src/luarocks/cmd/upload.lua
index a0b69447..ffcb1a0a 100644
--- a/src/luarocks/cmd/upload.lua
+++ b/src/luarocks/cmd/upload.lua
@@ -14,6 +14,8 @@ upload.help = [[
                  upload rockspec and source rock to server.
 --skip-pack      Do not pack and send source rock.
 --api-key=<key>  Give it an API key. It will be stored for subsequent uses.
+--temp-key=<key> Use the given a temporary API key in this invocation only.
+                 It will not be stored.
 --force          Replace existing rockspec if the same revision of
                  a module already exists. This should be used only 
                  in case of upload mistakes: when updating a rockspec,
diff --git a/src/luarocks/upload/api.lua b/src/luarocks/upload/api.lua
index ff00850e..a9afd1af 100644
--- a/src/luarocks/upload/api.lua
+++ b/src/luarocks/upload/api.lua
@@ -272,7 +272,7 @@ function api.new(flags)
    self.config = self:load_config() or {}
    self.config.server = flags["server"] or self.config.server or cfg.upload.server
    self.config.version = self.config.version or cfg.upload.version
-   self.config.key = flags["api-key"] or self.config.key
+   self.config.key = flags["temp-key"] or flags["api-key"] or self.config.key
    self.debug = flags["debug"]
    if not self.config.key then
       return nil, "You need an API key to upload rocks.\n" ..
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index 1bc24be7..bc8fc049 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -137,6 +137,7 @@ local supported_flags = {
    ["summary"] = "\"<text>\"",
    ["system-config"] = true,
    ["tag"] = "<tag>",
+   ["temp-key"] = "<key>",
    ["timeout"] = "<seconds>",
    ["to"] = "<path>",
    ["tree"] = "<path>",