Skip to content

Commit

Permalink
Merge pull request #88 from samoht/master
Browse files Browse the repository at this point in the history
Prepare the release
  • Loading branch information
samoht committed Jun 18, 2015
2 parents 08fdb61 + a90536e commit b2fd7a3
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 15 deletions.
8 changes: 8 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 1.5.1 (2015-06-18)

* Fix filesystem expansion when a filen ame becomes a directory name or when
a directory name becomes a file name (#87)
* Fix the order of entries in the tree objects (#86)
* Fix the compilation of tests (#85)
* Fetch all remote refs on synchronize (#83, by @AltGr)

### 1.5.0 (2015-06-12)

* Compatibility with `cohttp.0.18.` (#80 by @rgrinberg)
Expand Down
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,12 @@ $(VFILE): _oasis

init-doc:
mkdir -p gh-pages
cd gh-pages
git init
git remote add origin git@github.com:mirage/ocaml-git.git
git checkout gh-pages
git pull
cd gh-pages && ( \
git init && \
git remote add origin git@github.com:mirage/ocaml-git.git && \
git fetch && \
git checkout gh-pages && \
git pull)

update-doc: doc
rm -f gh-pages/*.html
Expand Down
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.4
Name: git
Version: 1.5.0
Version: 1.5.1
Synopsis: A low-level interface to Git in pure OCaml
Authors: Thomas Gazagnaire
License: ISC
Expand Down
12 changes: 6 additions & 6 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: d5c650a5f70adc7cb3acae6f71227700)
version = "1.5.0"
# DO NOT EDIT (digest: 2ff4edc4484753ef5804339c0f2ecd61)
version = "1.5.1"
description = "A low-level interface to Git in pure OCaml"
requires = "mstruct dolog ocamlgraph zip nocrypto uri lwt hex"
archive(byte) = "git.cma"
Expand All @@ -9,7 +9,7 @@ archive(native) = "git.cmxa"
archive(native, plugin) = "git.cmxs"
exists_if = "git.cma"
package "unix" (
version = "1.5.0"
version = "1.5.1"
description = "A low-level interface to Git in pure OCaml"
requires = "git git.http lwt cohttp.lwt lwt.unix conduit.lwt-unix"
archive(byte) = "git-unix.cma"
Expand All @@ -20,7 +20,7 @@ package "unix" (
)

package "top" (
version = "1.5.0"
version = "1.5.1"
description = "Toplevel printers for Git values"
requires = "git"
archive(byte) = "git_top.cma"
Expand All @@ -31,7 +31,7 @@ package "top" (
)

package "mirage" (
version = "1.5.0"
version = "1.5.1"
description = "A low-level interface to Git in pure OCaml"
requires =
"git git.http mirage-types.lwt io-page conduit.mirage dns.mirage mirage-http mirage-flow"
Expand All @@ -43,7 +43,7 @@ package "mirage" (
)

package "http" (
version = "1.5.0"
version = "1.5.1"
description = "A low-level interface to Git in pure OCaml"
requires = "git lwt cohttp.lwt uri.services"
archive(byte) = "git-http.cma"
Expand Down
6 changes: 3 additions & 3 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.1 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 336bff7b5770f39249cf61b64d51a84a) *)
(* DO NOT EDIT (digest: fe5782435b7fc5fd5bab6b105eb82553) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6861,7 +6861,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "git";
version = "1.5.0";
version = "1.5.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -7300,7 +7300,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "y\144E\132\134&\147¬\152r²ó\152Y\019_";
oasis_digest = Some "\028¼ÈÑðU:È¥â§Eø åý";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down

0 comments on commit b2fd7a3

Please sign in to comment.