summary refs log tree commit diff
path: root/Makefile
AgeCommit message (Collapse)Author
2018-06-27git: update to v2.18.0Christian Hesse
Update to git version v2.18.0. Required changes follow upstream commits: * Convert find_unique_abbrev* to struct object_id (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) * sha1_file: convert read_sha1_file to struct object_id (b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8) * sha1_file: convert sha1_object_info* to object_id (abef9020e3df87c441c9a3a95f592fce5fa49bb9) * object-store: move packed_git and packed_git_mru to object store (a80d72db2a73174b3f22142eb2014b33696fd795) * treewide: rename tree to maybe_tree (891435d55da80ca3654b19834481205be6bdfe33) The changed data types required some of our own functions to be converted to struct object_id: ls_item print_dir print_dir_entry print_object single_tree_cb walk_tree write_tree_link And finally we use new upstream functions that were added for struct object_id: hashcpy -> oidcpy sha1_to_hex -> oid_to_hex Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
2018-06-27git: update to v2.17.1Christian Hesse
Update to git version v2.17.1. Required changes: * The function 'typename' has been renamed to 'type_name' (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb) Signed-off-by: Christian Hesse <mail@eworm.de>
2018-06-16Makefile: drive asciidoc directly for HTML outputJohn Keeping
This is mostly taken from Git's doc/Makefile, although simplified for our use. The output now uses Asciidoc's default CSS which I think looks a bit nicer than the Docbook formatting; as a result of this we no longer need our custom .css file. A side effect of this change is that temporary files generated from the HTML output no longer conflict with the manpage output format (because any temporary HTML output files use names derived from the output filename which includes .html). Signed-off-by: John Keeping <john@keeping.me.uk>
2018-02-21doc: use consistent id's when generating html filesTodd Zullinger
The html documentation is generated using a2x which calls docbook tools to do the work. The generate.consistent.ids parameter ensures that when the docbook stylesheet assigns an id value to an output element it is consistent as long as the document structure has not changed. Having consistent html files reduces frivolous changes between builds. Distributions can more easily deploy multiple architecture builds and compare changes between package versions. End-users avoid needless changes in files deployed or backed up. The generate.consistent.ids parameter was added in docbook-xsl-1.77.0. Older versions gracefully ignore the parameter, so we can pass the parameter unconditionally. Most distributions contain docbook-xsl newer than 1.77.0. This includes Fedora, Debian, Ubuntu, and RHEL/CentOS 7. RHEL/CentOS 6 and Debian Wheezy (old stable) ship with an older version, unsurprisingly. Signed-off-by: Todd Zullinger <tmz@pobox.com>
2018-01-19git: update to v2.16.0Christian Hesse
Update to git version v2.16.0: * refs: convert resolve_ref_unsafe to struct object_id (49e61479be913f67e66bb3fdf8de9475c41b58bd) * diff: remove DIFF_OPT_SET macro (23dcf77f48feb49c54bad09210f093a799816334) * log: add option to choose which refs to decorate (65516f586b69307f977cd67cc45513a296cabc25) * diff: convert flags to be stored in bitfields (02f2f56bc377c287c411947d0e1482aac888f8db) Signed-off-by: Christian Hesse <mail@eworm.de>
2017-12-06git: update to v2.15.1Christian Hesse
Update to git version v2.15.1: With commit 0abe14f6 prepare_packed_git() moved to packfile.[ch]. Signed-off-by: Christian Hesse <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
2017-08-10git: update to v2.14Jeff Smith
Numerous changes were made to git functions to use an object_id structure rather than sending sha1 hashes as raw unsigned character arrays. The functions that affect cgit are: parse_object, lookup_commit_reference, lookup_tag, lookup_tree, parse_tree_indirect, diff_root_tree_sha1, diff_tree_sha1, and format_display_notes. Commit b2141fc (config: don't include config.h by default) made it necessary to that config.h be explicitly included when needed. Commit 07a3d41 (grep: remove regflags from the public grep_opt API) removed one way of specifying the ignore-case grep option. Signed-off-by: Jeff Smith <whydoubt@gmail.com>
2017-08-10git: update to v2.13.4Christian Hesse
Update to git version v2.13.4: With commit 8aee769f (pathspec: copy and free owned memory) the definition of struct pathspec_item has changed with the expectation that pathspecs will be managed dynamically. We work around this a bit by setting up a static structure, but let's allocate the match string to avoid needing to cast away const. Updated a patch from John Keeping <john@keeping.me.uk> for git v2.12.1.
2016-11-30git: update to v2.11.0Christian Hesse
Update to git version v2.11.0. Function write_archive() dropped argument (int setup_prefix).
2016-11-23Bump version.Jason A. Donenfeld
2016-11-06git: update to v2.10.2Christian Hesse
Update to git version v2.10.2, no changes required.
2016-10-04git: update to v2.10.1Christian Hesse
Update to git version v2.10.1, no changes required.
2016-10-01Makefile: remove extra spaceJason A. Donenfeld
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-09-04git: update to v2.10.0Christian Hesse
Upstream continues to replace unsigned char *sha1 with struct object_id old_oid. This makes the required changes. The git lib has its own main function now. Rename our main function to cmd_main, it is called from main then.
2016-07-12git: update to v2.9.1Christian Hesse
Update to git version v2.9.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-06-17git: update to v2.9.0Christian Hesse
Update to git version v2.9.0, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-06-07Bump version.Jason A. Donenfeld
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-05-20git: update to v2.8.3Christian Hesse
Update to git version v2.8.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-05-12git: update to v2.8.2Christian Hesse
Update to git version v2.8.2. * Upstream commit 1a0c8dfd89475d6bb09ddee8c019cf0ae5b3bdc2 (strbuf: give strbuf_getline() to the "most text friendly" variant) changed API. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-23git: update to v2.7.2Christian Hesse
Update to git version v2.7.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-08git: update to v2.7.1Christian Hesse
Update to git version v2.7.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2016-01-14Bump versionJason A. Donenfeld
2016-01-13git: update to v2.7.0Christian Hesse
Update to git version v2.7.0. * Upstream commit ed1c9977cb1b63e4270ad8bdf967a2d02580aa08 (Remove get_object_hash.) changed API: Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-10-09Makefile: fix MAKEFLAGS tests with multiple flagsJohn Keeping
findstring is defined as $(findstring FIND,IN) so if multiple flags are set these tests do the wrong thing unless $(MAKEFLAGS) is the second argument. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-10-06git: update to v2.6.1Christian Hesse
Update to git version v2.6.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-08-13Makefile: make "git/config.mak.uname" inclusion optionalJohn Keeping
If we haven't got a "git" directory, it should still be possible to run "make get-git", so we cannot include this file unconditionally. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-13Makefile: include Git's config.mak.unameJohn Keeping
This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk>
2015-08-12git: update to v2.5.0Christian Hesse
Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de>
2015-05-14git: update to v2.4.1Christian Hesse
Update to git version v2.4.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-14git: update to v2.3.3Christian Hesse
Update to git version v2.3.3, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-13Bump versionJason A. Donenfeld
2015-03-09Makefile: add a target to run CGit through sparseJohn Keeping
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-07git: update to v2.3.2Christian Hesse
Update to git version v2.3.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-05Bump versionJason A. Donenfeld
2015-03-03git: update to v2.3.1Christian Hesse
Update to git version v2.3.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-02-15Bump verisonJason A. Donenfeld
2015-02-08git: update for v2.3.0Christian Hesse
* sort_string_list(): rename to string_list_sort() (upstream commit 3383e199) * update read_tree_recursive callback to pass strbuf as base (upstream commit 6a0b0b6d) Signed-off-by: Christian Hesse <mail@eworm.de>
2015-01-13git: update to v2.2.2Christian Hesse
Update to git version v2.2.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2014-12-24Revert "git: use xz compressed archive for download"Jason A. Donenfeld
This reverts commit a87c9d8a9779eab0499efd3c44e090a28c7d1cdf. We want to make OpenBSD people happy.
2014-12-23git: use xz compressed archive for downloadChristian Hesse
2014-12-23git: update to v2.2.1Christian Hesse
Update to git version v2.2.1, including API changes. Signed-off-by: Christian Hesse <mail@eworm.de>
2014-08-07git: update to v2.0.4John Keeping
No CGit changes required. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-07-28git: update to v2.0.3John Keeping
This is slightly more involved than just bumping the version number because it pulls in a change to convert the commit buffer to a slab, removing the "buffer" field from "struct commit". All sites that access "commit->buffer" have been changed to use the new functions provided for this purpose. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-06-30Bump version.Jason A. Donenfeld
2014-06-28git: update to 2.0.1Christian Hesse
Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
2014-06-28git: update for git 2.0Christian Hesse
prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine.
2014-04-12git: update to 1.9.2Christian Hesse
Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld
2014-03-20git: update to 1.9.1Christian Hesse
Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required.
2014-02-28Bump version.Jason A. Donenfeld