* jn/conf:
autoconf: clean temporary file mak.append
autoconf: Move variables which we always set to config.mak.in
autoconf: Improvements in NO_PYTHON/PYTHON_PATH handling
autoconf: Error out on --without-shell and --without-perl
autoconf: Add configure target to main Makefile
When configure is interrupted in the middle it leaves
config.mak.append behind. Add it to .gitignore and make sure
$(MAKE) clean removes it.
Also earlier .gitignore listed config.mak.in which is a tracked
file. Fix it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
While at it fill git version information in configure.ac
configure target needs autoconf, of course.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* jn/conf:
autoconf: NO_IPV6
autoconf: Set NEEDS_LIBICONV unconditionally if there is no iconv in libc
autoconf: fix NEEDS_SSL_WITH_CRYPTO
Copy description of new build configuration variables to configure.ac
autoconf: Typo cleanup, reordering etc.
autoconf: Check for ll hh j z t size specifiers introduced by C99
* mk/rename:
git.c: Rename NEEDS_PREFIX to RUN_SETUP
builtins: Makefile clean-up
Make git-checkout-index a builtin
Make git-symbolic-ref a builtin
Make git-unpack-objects a builtin
Make git-pack-objects a builtin
Make git-name-rev a builtin
This cleans up the build procedure for built-in commands by:
- generating mostly redundant definition of BUILT_INS from
BUILTIN_OBJS in the Makefile,
- renaming a few files to make the above possible, and
- sorting the built-in command table in git.c.
It might be a good idea to binary search (or perfect hash) the built-in
command table, but that can be done later when somebody feels like.
Signed-off-by: Junio C Hamano <junkio@cox.net>
* jc/c99:
Cygwin needs NO_C99_FORMAT???
git-grep: document --and, --or, --not, ( and )
use declarations from builtin.h for builtin commands
Make git-repo-config a builtin
* master:
Make git-prune-packed a builtin
git-annotate: remove extraneous debugging line
Documentation: convert uses of git-link macro to gitlink
git-push: remove obsolete git-push.sh
git-push: allow -f as an alias for --force
This makes it easier to run gitweb/gitweb.perl without token substitution.
Using @@ makes Perl emit "unintended interpolation" warnings.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Configuration will first be taken from variables inside the gitweb.cgi
script, which in turn come from the Makefile. Afterwards, the contents of
GITWEB_CONFIG are read, overriding the builtin defaults.
This should eliminate the need for editing the gitweb script at all. Users
should edit the Makefile and/or add a config file.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* rj/header:
Fix header breakage with _XOPEN_SOURCE.
Remove cmd_usage() routine and re-organize the help/usage code.
Fix header breakage due to redefining PATH_MAX.
Add NO_C99_FORMAT to support older compilers.
New tests and en-passant modifications to mktag.
Fix installation of templates on ancient systems.
Fix annotate test script; notice when git-annotate fails.
Ensure git-clone exits with error if perl script fails.
The NO_C99_FORMAT macro allows compilers that lack support for the
ll,hh,j,z,t size specifiers (eg. gcc 2.95.2) to adapt the code to avoid
runtime errors in the formatted IO functions.
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down
to the templates makefile.
[jc: we have fixed the main Makefile long time ago, but somehow
forgot to apply the same fix to templates Makefile.]
Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* jn/web:
Makefile: gitweb/gitweb.cgi is now generated.
gitweb/README: do not bug Kay with gitweb questions anymore
gitweb: use out-of-line GIT logo.
gitweb: fill in gitweb configuration by Makefile
Use the normal web server instead of the CGI to provide the git logo,
just like the gitweb.css.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Generate gitweb/gitweb.cgi to reduce the need to patch gitweb.cgi
by the end user. The GIT installation directory is already known
by the Makefile, and can be inserted directly into gitweb.
All other gitweb configuration parameters can now be specified by
providing GITWEB_* variables while building GIT. These are described
in gitweb/README.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* js/c-merge-recursive:
merge-recur: use the unpack_trees() interface instead of exec()ing read-tree
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
merge-recur: fix thinko in unique_path()
* js/read-tree:
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
* jn/web:
gitweb: Ref refactoring - use git_get_referencing for marking tagged/head commits
gitweb: Remove characters entities entirely when shortening string
gitweb: Headers refactoring - use git_header_div for header divs
gitweb: Remove $project from git_get_paging_nav arguments
gitweb: Pager refactoring - use git_get_paging_nav for pagination
gitweb: Add "\n" after <br/> in git_page_nav
gitweb: Show project descriptions with utf-8 characters in project list correctly
gitweb: Replace form-feed character by ^L
gitweb: Navbar refactoring - use git_page_nav to generate navigation bar
gitweb: Add git_page_nav for later use
gitweb: Cleanup - chomp @lines in consistent style
gitweb: Cleanup - chomp $line in consistent style
gitweb: More explicit error messages for open "-|"
gitweb: simplify git_get_hash_by_path
gitweb: Use list for of open for running git commands, thorougly.
gitweb: whitespace cleanup
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
* js/read-tree: (107 commits)
read-tree: move merge functions to the library
read-trees: refactor the unpack_trees() part
tar-tree: illustrate an obscure feature better
git.c: allow alias expansion without a git directory
setup_git_directory_gently: do not barf when GIT_DIR is given.
Build on Debian GNU/kFreeBSD
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
log and diff family: honor config even from subdirectories
git-reset: detect update-ref error and report it.
lost-found: use fsck-objects --full
Teach git-http-fetch the --stdin switch
Teach git-local-fetch the --stdin switch
Make pull() support fetching multiple targets at once
...
Basically, the options are passed by a struct unpack_trees_options now.
That's all.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* jn/make:
Set datarootdir in config.mak.in
Quote all calls to GIT_CONF_APPEND_LINE
Typofix in configure.ac comment.
configure.ac vertical whitespace usage cleanup
autoconf: Checks for some programs
autoconf: Checks for libraries
autoconf: Checks for some library functions.
autoconf: Checks for typedefs, structures, and compiler characteristics.
autoconf: Preparing the way for autodetection
Copy description of build configuration variables to configure.ac
Teach make clean about configure and autoconf
autoconf: Use autoconf to write installation directories to config.mak.autogen
This pulls Linus's setup_git_directory() restructuring in via
the setup-n-mv merge conflict resolution branch.
* __/setup-n-mv:
Call setup_git_directory() much earlier
Call setup_git_directory() early
Display an error from update-ref if target ref name is invalid.
Fix http-fetch
t4103: fix binary patch application test.
git-apply -R: binary patches are irreversible for now.
Teach git-apply about '-R'
Makefile: ssh-pull.o depends on ssh-fetch.c
This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
* js/c-merge-recursive:
Makefile: git-merge-recur depends on xdiff libraries.
merge-recur: Explain why sha_eq() and struct stage_data cannot go
merge-recur: Cleanup last mixedCase variables...
merge-recur: Fix compiler warning with -pedantic
merge-recur: Remove dead code
merge-recur: Get rid of debug code
merge-recur: Convert variable names to lower_case
Cumulative update of merge-recursive in C
* js/mv:
builtin git-mv: support moving directories
Make git-mv a builtin
Extract helper bits from c-merge-recursive work
git-cvsserver: support multiline commit messages
t7001: add test for git-mv dir1 dir2/
gitweb: fix two warnings
git-instaweb: respect bindir from Makefile
git-instaweb: some Apache have mod_cgi builtin
t4112: simplify the test and remove unneeded working tree file.
Extend testing git-mv for renaming of subdirectories
This also moves add_file_to_index() to read-cache.c. Oh, and while
touching builtin-add.c, it also removes a duplicate git_config() call.
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
* sp/darwin:
upload-pack: fix timeout in create_pack_file
Defaulting fetch to origin when set in the repo-config
Colorize 'commit' lines in log ui
git-am: Don't accept an mbox on stdin of we already have a .dotest directory
show-branch: Fix another performance problem.
pack-objects: check pack.window for default window size
Disable linking with Fink or DarwinPorts.
git.el: Put the git customize group in the 'tools' parent group.
git.el: Try to reuse an existing buffer when running git-status.
git.el: Prepend a slash to the file name when adding to .gitignore.
git.el: Run git-rerere on commits if the rr-cache directory exists.
git-svn: fix fetching new directories copies when using SVN:: libs
tar-tree: add the "tar.umask" config option
cvsexportcommit - add -a (add author line) flag, cleanup warnings
* master: (176 commits)
upload-pack: fix timeout in create_pack_file
Defaulting fetch to origin when set in the repo-config
Colorize 'commit' lines in log ui
git-am: Don't accept an mbox on stdin of we already have a .dotest directory
show-branch: Fix another performance problem.
pack-objects: check pack.window for default window size
Disable linking with Fink or DarwinPorts.
git.el: Put the git customize group in the 'tools' parent group.
git.el: Try to reuse an existing buffer when running git-status.
git.el: Prepend a slash to the file name when adding to .gitignore.
git.el: Run git-rerere on commits if the rr-cache directory exists.
git-svn: fix fetching new directories copies when using SVN:: libs
tar-tree: add the "tar.umask" config option
cvsexportcommit - add -a (add author line) flag, cleanup warnings
unpack-objects: remove stale and confusing comment
git-fetch: fix --keep vs --thin
git-svn: don't check for migrations/upgrades on commit-diff
show-branch: fix performance problem.
Documentation/urls.txt: Use substitution to escape square brackets
Documentation/Makefile: product depends on asciidoc.conf
...
It may be desirable for the compiler to disable linking against Fink
or DarwinPorts, especially if both are installed on the system and
the user wants GIT to be linked specifically to only one of them.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
