커밋 그래프

237 커밋

작성자 SHA1 메시지 날짜
John Keeping
48f175083a Makefile: drive asciidoc directly for HTML output
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-06-16 14:06:03 +01:00
Todd Zullinger
33414d7869 doc: use consistent id's when generating html files
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-02-21 03:12:57 +01:00
Christian Hesse
1dd53e3a2f git: update to v2.16.0
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>
2018-01-19 11:34:43 +01:00
Christian Hesse
5d947ba3f0 git: update to v2.15.1
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-12-06 20:29:10 +01:00
Jeff Smith
86a6d358f7 git: update to v2.14
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-10 15:58:24 +02:00
Christian Hesse
3d33b46df2 git: update to v2.13.4
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.
2017-08-10 15:15:54 +02:00
Christian Hesse
91153fd02e git: update to v2.11.0
Update to git version v2.11.0. Function write_archive()
dropped argument (int setup_prefix).
2016-11-30 10:43:08 +01:00
Jason A. Donenfeld
8e9ddd21a5 Bump version. 2016-11-23 05:24:36 +01:00
Christian Hesse
44f8c11c8d git: update to v2.10.2
Update to git version v2.10.2, no changes required.
2016-11-06 21:47:04 +01:00
Christian Hesse
d6a4730d04 git: update to v2.10.1
Update to git version v2.10.1, no changes required.
2016-10-04 21:54:30 +02:00
Jason A. Donenfeld
ef3108656b Makefile: remove extra space
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-10-01 23:35:04 +02:00
Christian Hesse
11695a58fd git: update to v2.10.0
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-09-04 12:38:18 +02:00
Christian Hesse
d6b0332982 git: update to v2.9.1
Update to git version v2.9.1, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2016-07-12 01:04:56 +02:00
Christian Hesse
1e039ada85 git: update to v2.9.0
Update to git version v2.9.0, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2016-06-17 12:36:58 +02:00
Jason A. Donenfeld
a6572ce176 Bump version.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2016-06-07 14:45:04 +02:00
Christian Hesse
41508c0911 git: update to v2.8.3
Update to git version v2.8.3, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2016-05-20 11:04:43 +09:00
Christian Hesse
86bf5b4791 git: update to v2.8.2
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-05-12 17:23:29 +02:00
Christian Hesse
a9e9dfc55f git: update to v2.7.2
Update to git version v2.7.2, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-23 03:16:26 +01:00
Christian Hesse
85ec9f0211 git: update to v2.7.1
Update to git version v2.7.1, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2016-02-08 14:24:52 +01:00
Jason A. Donenfeld
e64d5e04c3 Bump version 2016-01-14 15:43:54 +01:00
Christian Hesse
559ab5ecc4 git: update to v2.7.0
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>
2016-01-13 17:12:17 +01:00
John Keeping
35b3c67ac2 Makefile: fix MAKEFLAGS tests with multiple flags
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-09 10:56:06 +02:00
Christian Hesse
978ce8c00c git: update to v2.6.1
Update to git version v2.6.1, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-10-06 16:39:06 +02:00
John Keeping
c543d7dbf6 Makefile: make "git/config.mak.uname" inclusion optional
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-13 17:05:12 +02:00
John Keeping
0393102249 Makefile: include Git's config.mak.uname
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-13 15:36:37 +02:00
Christian Hesse
de83de276b git: update to v2.5.0
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-08-12 14:09:05 +02:00
Christian Hesse
2eb41c4665 git: update to v2.4.1
Update to git version v2.4.1, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-05-14 13:49:12 +02:00
Christian Hesse
84627609f5 git: update to v2.3.3
Update to git version v2.3.3, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-14 17:56:15 +01:00
Jason A. Donenfeld
cadbb69990 Bump version 2015-03-13 16:22:11 +01:00
John Keeping
5150b7c1e6 Makefile: add a target to run CGit through sparse
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09 17:38:22 +01:00
Christian Hesse
97a91657a5 git: update to v2.3.2
Update to git version v2.3.2, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-07 12:45:58 +01:00
Jason A. Donenfeld
198d84a9e3 Bump version 2015-03-05 15:58:28 +01:00
Christian Hesse
911d574250 git: update to v2.3.1
Update to git version v2.3.1, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-03 16:47:22 +01:00
Jason A. Donenfeld
5e3e665d60 Bump verison 2015-02-15 22:12:12 +01:00
Christian Hesse
7358f63015 git: update for v2.3.0
* 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-02-08 18:11:09 +01:00
Christian Hesse
c641e0ab64 git: update to v2.2.2
Update to git version v2.2.2, no changes required.

Signed-off-by: Christian Hesse <mail@eworm.de>
2015-01-13 14:54:22 +01:00
Jason A. Donenfeld
b122730014 Revert "git: use xz compressed archive for download"
This reverts commit a87c9d8a97.

We want to make OpenBSD people happy.
2014-12-24 12:50:11 +01:00
Christian Hesse
a87c9d8a97 git: use xz compressed archive for download 2014-12-23 19:14:07 -07:00
Christian Hesse
17838ec630 git: update to v2.2.1
Update to git version v2.2.1, including API changes.

Signed-off-by: Christian Hesse <mail@eworm.de>
2014-12-23 18:53:03 -07:00
John Keeping
49f607777f git: update to v2.0.4
No CGit changes required.

Signed-off-by: John Keeping <john@keeping.me.uk>
2014-08-07 14:42:34 +02:00
John Keeping
865afe0eb1 git: update to v2.0.3
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-07-28 02:01:35 +02:00
Jason A. Donenfeld
eeaffc3343 Bump version. 2014-06-30 15:15:35 +02:00
Christian Hesse
390ffad022 git: update to 2.0.1
Everything works just bumping the version in Makefile and commit hash in
submodule. No code changes required.
2014-06-28 16:07:30 +02:00
Christian Hesse
79c985e13c git: update for git 2.0
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-06-28 15:14:56 +02:00
Christian Hesse
dcb16f0d11 git: update to 1.9.2
Everything works just bumping the version in Makefile and commit hash in
submodule. No code changes required.
2014-04-12 18:05:43 +02:00
Jason A. Donenfeld
88b9311323 Makefile: use more reliable git tarball mirror 2014-03-20 11:20:01 -06:00
Christian Hesse
45315f846c git: update to 1.9.1
Everything works just bumping the version in Makefile and commit hash
in submodule. No code changes required.
2014-03-20 11:14:03 -06:00
Jason A. Donenfeld
f2fa9c56e2 Bump version. 2014-02-28 00:12:08 +01:00
Lukas Fleischer
8033dc01f4 git: Update to 1.9.0
No code changes required, just bump the submodule and Makefile versions.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2014-02-21 01:18:54 +01:00
Sebastian Andrzej Siewior
d3581b5889 cache: use sendfile() instead of a pair of read() + write()
sendfile() does the same job and avoids to copy the content into userland
and back. One has to define NO_SENDFILE in case the OS (kernel / libc)
does not supported. It is disabled by default on non-linux environemnts.
According to the glibc, sendfile64() was added in Linux 2.4 (so it has
been there for a while) but after browsing over the mapage of FreeBSD's I
noticed that the prototype is little different.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
2014-01-19 15:08:49 +01:00