projects
/
platform
/
upstream
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
packaging: Add contrib installation
[platform/upstream/git.git]
/
shell.c
diff --git
a/shell.c
b/shell.c
index
40084a3
..
cef7ffd
100644
(file)
--- a/
shell.c
+++ b/
shell.c
@@
-4,6
+4,7
@@
#include "strbuf.h"
#include "run-command.h"
#include "alias.h"
#include "strbuf.h"
#include "run-command.h"
#include "alias.h"
+#include "prompt.h"
#define COMMAND_DIR "git-shell-commands"
#define HELP_COMMAND COMMAND_DIR "/help"
#define COMMAND_DIR "git-shell-commands"
#define HELP_COMMAND COMMAND_DIR "/help"
@@
-16,10
+17,10
@@
static int do_generic_cmd(const char *me, char *arg)
setup_path();
if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
die("bad argument");
setup_path();
if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
die("bad argument");
- if (!s
tarts_with(me, "git-"
))
+ if (!s
kip_prefix(me, "git-", &me
))
die("bad command");
die("bad command");
- my_argv[0] = me
+ 4
;
+ my_argv[0] = me;
my_argv[1] = arg;
my_argv[2] = NULL;
my_argv[1] = arg;
my_argv[2] = NULL;
@@
-76,12
+77,11
@@
static void run_shell(void)
int count;
fprintf(stderr, "git> ");
int count;
fprintf(stderr, "git> ");
- if (
strbuf_getline_lf(&line, stdin
) == EOF) {
+ if (
git_read_line_interactively(&line
) == EOF) {
fprintf(stderr, "\n");
strbuf_release(&line);
break;
}
fprintf(stderr, "\n");
strbuf_release(&line);
break;
}
- strbuf_trim(&line);
rawargs = strbuf_detach(&line, NULL);
split_args = xstrdup(rawargs);
count = split_cmdline(split_args, &argv);
rawargs = strbuf_detach(&line, NULL);
split_args = xstrdup(rawargs);
count = split_cmdline(split_args, &argv);