Merge branch 'ma/sequencer-do-reset-saner-loop-termination'

diff --git a/prompt.c b/prompt.c
index 8181eebbfcd0080540bc580416336436ced98297..6d5885d0096407d7d12f4511100ebee5cb5f752d 100644 (file)
--- a/prompt.c
+++ b/prompt.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "config.h"
 #include "run-command.h"
 #include "strbuf.h"
 #include "prompt.h"
@@ -73,8 +74,3 @@ char *git_prompt(const char *prompt, int flags)
        }
        return r;
 }
-
-char *git_getpass(const char *prompt)
-{
-       return git_prompt(prompt, PROMPT_ASKPASS);
-}