From ee0f4dcd60c5e9eaef4de61ba93af73e57f9d88a Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <t@crashfast.com>
Date: Thu, 23 Apr 2015 20:40:22 -0500
Subject: merge_locks crashed if a config didn't have a deps entry

---
 src/rebar_config.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 58b2c4d..c858fef 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -69,7 +69,7 @@ merge_locks(Config, [[]]) ->
     Config;
 %% lockfile with entries
 merge_locks(Config, [Locks]) ->
-    {deps, ConfigDeps} = lists:keyfind(deps, 1, Config),
+    ConfigDeps = proplists:get_value(deps, Config, []),
     %% We want the top level deps only from the lock file.
     %% This ensures deterministic overrides for configs.
     %% Then check if any new deps have been added to the config
-- 
cgit v1.1