diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:23 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-22 11:27:23 -0800 |
commit | ded408fd20e2fedb76850c9fa9bbaa26b888aa7c (patch) | |
tree | f048693eb0afb979809bee23bd03f3f2dd53564a /prompt.h | |
parent | Merge branch 'jk/http-push-to-empty' (diff) | |
parent | contrib: add credential helper for OS X Keychain (diff) | |
download | tgif-ded408fd20e2fedb76850c9fa9bbaa26b888aa7c.tar.xz |
Merge branch 'jk/git-prompt'
* jk/git-prompt:
contrib: add credential helper for OS X Keychain
Makefile: OS X has /dev/tty
Makefile: linux has /dev/tty
credential: use git_prompt instead of git_getpass
prompt: use git_terminal_prompt
add generic terminal prompt function
refactor git_getpass into generic prompt function
move git_getpass to its own source file
imap-send: don't check return value of git_getpass
imap-send: avoid buffer overflow
Conflicts:
Makefile
Diffstat (limited to 'prompt.h')
-rw-r--r-- | prompt.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/prompt.h b/prompt.h new file mode 100644 index 0000000000..04f321a781 --- /dev/null +++ b/prompt.h @@ -0,0 +1,10 @@ +#ifndef PROMPT_H +#define PROMPT_H + +#define PROMPT_ASKPASS (1<<0) +#define PROMPT_ECHO (1<<1) + +char *git_prompt(const char *prompt, int flags); +char *git_getpass(const char *prompt); + +#endif /* PROMPT_H */ |