From d6dc56da035774b39293f1370a374c39953d0995 Mon Sep 17 00:00:00 2001
From: Fred Hebert <mononcqc@ferd.ca>
Date: Mon, 23 Feb 2015 16:16:40 -0500
Subject: Fix lock merging for nonexistant lock files.

---
 src/rebar_config.erl | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src')

diff --git a/src/rebar_config.erl b/src/rebar_config.erl
index 63b7af7..c1c4381 100644
--- a/src/rebar_config.erl
+++ b/src/rebar_config.erl
@@ -60,8 +60,13 @@ consult_file(File) ->
             end
     end.
 
+%% no lockfile
+merge_locks(Config, []) ->
+    Config;
+%% empty lockfile
 merge_locks(Config, [[]]) ->
     Config;
+%% lockfile with entries
 merge_locks(Config, [Locks]) ->
     {deps, ConfigDeps} = lists:keyfind(deps, 1, Config),
     %% We want the top level deps only from the lock file.
-- 
cgit v1.1