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 /compat/terminal.h | |
| parent | 200888ef3bbc150cc20b99e0aa039c751c00e07a (diff) | |
| parent | 34961d30dae69b00a8a5aabd568fb87f376ebb87 (diff) | |
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 'compat/terminal.h')
| -rw-r--r-- | compat/terminal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/compat/terminal.h b/compat/terminal.h new file mode 100644 index 0000000000..97db7cd69d --- /dev/null +++ b/compat/terminal.h @@ -0,0 +1,6 @@ +#ifndef COMPAT_TERMINAL_H +#define COMPAT_TERMINAL_H + +char *git_terminal_prompt(const char *prompt, int echo); + +#endif /* COMPAT_TERMINAL_H */ |