projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commit: pay attention to submodule.$name.ignore in .gitmodules
[git.git]
/
git.c
diff --git
a/git.c
b/git.c
index 8de48107e0dced316704c1ad78569ccb9eeebb08..50a14013c5a87fed200df0a5a4ec6db0f1e2c223 100644
(file)
--- a/
git.c
+++ b/
git.c
@@
-1,6
+1,7
@@
#include "builtin.h"
#include "builtin.h"
-#include "exec_cmd.h"
#include "cache.h"
#include "cache.h"
+#include "exec_cmd.h"
+#include "help.h"
#include "quote.h"
#include "run-command.h"
#include "quote.h"
#include "run-command.h"
@@
-56,9
+57,6
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
{
int handled = 0;
{
int handled = 0;
- if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS"))
- setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1);
-
while (*argc > 0) {
const char *cmd = (*argv)[0];
if (cmd[0] != '-')
while (*argc > 0) {
const char *cmd = (*argv)[0];
if (cmd[0] != '-')
@@
-137,7
+135,7
@@
static int handle_options(const char ***argv, int *argc, int *envchanged)
fprintf(stderr, "-c expects a configuration string\n" );
usage(git_usage_string);
}
fprintf(stderr, "-c expects a configuration string\n" );
usage(git_usage_string);
}
- git_config_p
arse
_parameter((*argv)[1]);
+ git_config_p
ush
_parameter((*argv)[1]);
(*argv)++;
(*argc)--;
} else {
(*argv)++;
(*argc)--;
} else {