Remove build dependency on git from the configure script

diff --git a/NEWS b/NEWS
index 1a1717797b093e0d395b5ea116fa82942dc5c7b4..e013e2a30adf3f0d49a051240477eafebb9a72d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,9 @@ Incompatibilities:
 
  - Setting the cursor color no longer automatically sets the text to
    bold. The old 'lazy' behavior was a bug.
+ - Remove check for git-repo-config, which was officially deprecated in
+   git version 1.5.4. The configure script no longer depends on git
+   being installed.
 
 Improvements:
 

diff --git a/configure.ac b/configure.ac
index b179389febd36f351cad70e0cd26e313ecc55a16..27a78b12b5bc8e0a1ab8ecaee149cce850b4aae7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,13 +23,6 @@ AM_ICONV
 
 AC_PROG_CC
 
-AC_CHECK_PROG(GIT, [git], [git], [AC_ERROR([git not found])])
-AC_MSG_CHECKING([which config subcommand git supports])
-GIT_CONFIG="repo-config"
-git config --list >/dev/null && GIT_CONFIG="config"
-AC_MSG_RESULT([$GIT_CONFIG])
-AC_DEFINE_UNQUOTED(GIT_CONFIG,"$GIT_CONFIG",[git config subcommand])
-
 AC_CHECK_PROGS(ASCIIDOC, [asciidoc false])
 AC_CHECK_PROGS(XMLTO, [xmlto false])
 AC_CHECK_PROGS(DOCBOOK2PDF, [docbook2pdf false])

diff --git a/tig.c b/tig.c
index 0f9ff04cbfe37e7564ffcb88405a134300a23d14..c4d2634380b9ad01c6dcdd401d8941c2fe74d1db 100644 (file)
--- a/tig.c
+++ b/tig.c
@@ -114,10 +114,6 @@ static size_t utf8_length(const char **string, size_t col, int *width, size_t ma
 
 #define S_ISGITLINK(mode) (((mode) & S_IFMT) == 0160000)
 
-#ifndef GIT_CONFIG
-#define GIT_CONFIG "config"
-#endif
-
 /* Some ASCII-shorthands fitted into the ncurses namespace. */
 #define KEY_TAB                '\t'
 #define KEY_RETURN     '\r'
@@ -7467,7 +7463,7 @@ read_repo_config_option(char *name, size_t namelen, char *value, size_t valuelen
 static int
 load_git_config(void)
 {
-       const char *config_list_argv[] = { "git", GIT_CONFIG, "--list", NULL };
+       const char *config_list_argv[] = { "git", "config", "--list", NULL };
 
        return run_io_load(config_list_argv, "=", read_repo_config_option);
 }