path: root/git.c
diff options
authorJunio C Hamano <>2019-08-02 20:12:02 (GMT)
committerJunio C Hamano <>2019-08-02 20:12:02 (GMT)
commitc62bc49139f1d18e922fc98e35bb08b1aadbcafc (patch)
tree07dbd436a0d855988ea2a7455eb9a3560bf208d7 /git.c
parent9b274e28871b3e4a4109582a34625df5fddc91c8 (diff)
parentb91408400757d021b10876c36280ef891b502420 (diff)
Merge branch 'js/visual-studio'
Support building Git with Visual Studio The bits about .git/branches/* have been dropped from the series. We may want to drop the support for it, but until that happens, the tests should rely on the existence of the support to pass. * js/visual-studio: (23 commits) git: avoid calling aliased builtins via their dashed form bin-wrappers: append `.exe` to target paths if necessary .gitignore: ignore Visual Studio's temporary/generated files .gitignore: touch up the entries regarding Visual Studio vcxproj: also link-or-copy builtins msvc: add a Makefile target to pre-generate the Visual Studio solution contrib/buildsystems: add a backend for modern Visual Studio versions contrib/buildsystems: handle options starting with a slash contrib/buildsystems: also handle -lexpat contrib/buildsystems: handle libiconv, too contrib/buildsystems: handle the curl library option contrib/buildsystems: error out on unknown option contrib/buildsystems: optionally capture the dry-run in a file contrib/buildsystems: redirect errors of the dry run into a log file contrib/buildsystems: ignore gettext stuff contrib/buildsystems: handle quoted spaces in filenames contrib/buildsystems: fix misleading error message contrib/buildsystems: ignore irrelevant files in Generators/ contrib/buildsystems: ignore invalidcontinue.obj urlencode '<' and '>' when generating VC projects ...
Diffstat (limited to 'git.c')
1 files changed, 0 insertions, 3 deletions
diff --git a/git.c b/git.c
index 74ad855..c1ee712 100644
--- a/git.c
+++ b/git.c
@@ -739,8 +739,6 @@ static int run_argv(int *argcp, const char ***argv)
if (!done_alias)
handle_builtin(*argcp, *argv);
-#if 0 // TODO In GFW, need to amend a7924b655e940b06cb547c235d6bed9767929673 to include trace2_ and _tr2 lines.
else if (get_builtin(**argv)) {
struct argv_array args = ARGV_ARRAY_INIT;
int i;
@@ -775,7 +773,6 @@ static int run_argv(int *argcp, const char ***argv)
die("could not execute builtin %s", **argv);
-#endif // a7924b655e940b06cb547c235d6bed9767929673
/* .. then try the external ones */