Merge #30

30: Clone git repository into correct dir r=CAD97 a=CAD97

bors: r+

.travis.yml

@@ -27,13 +27,13 @@ matrix:
     script:
     - cargo clippy -- -D clippy
   # GitHub Pages
-  - env: CARGO_GHP_VERSION=0.3.0
+  - env: CARGO_GHP_VERSION=0.3.1
     install:
-    - travis_wait cargo install cargo-ghp-upload --version $CARGO_GHP_VERSION || echo "cargo-ghp-upload already installed"
+    - cargo install cargo-ghp-upload --version $CARGO_GHP_VERSION || echo "cargo-ghp-upload already installed"
     after_success:
     - cargo ghp-upload -vvvr
   allow_failures:
-  - env: CARGO_GHP_VERSION=0.3.0
+  - env: CARGO_GHP_VERSION=0.3.1
   fast_finish: true
 
 script:

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.3.1]
+
+- Fixed builds when `./target/ghp` does not exists and the target repo has a GHP branch
+
 ## [0.3.0]
 
 - Fixed builds on Travis always being picked up as a tag build instead of a branch build
@@ -34,7 +38,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Now can infer much more context from Git if not in Travis-like environment
 - Default commit message changed
 
-  [Unreleased]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.3.0...master
+  [Unreleased]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.3.1...master
+  [0.3.1]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.3.0...0.3.1
   [0.3.0]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.2.0...0.3.0
   [0.2.0]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.1.1...0.2.0
   [0.1.1]: https://github.com/crate-ci/cargo-ghp-upload/compare/0.1.0...0.1.1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cargo-ghp-upload"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["CAD97 <[email protected]>"]
 description = "Upload documentation straight to GitHub Pages, maintaining branch separation and history"
 

README.md

@@ -15,7 +15,7 @@ To do that, you can minimally include the following in your Travis matrix:
 ```yaml
 matrix:
   include:
-  - env: GHP_UPLOAD_VERSION=0.3.0
+  - env: GHP_UPLOAD_VERSION=0.3.1
     install:
     - cargo install --version $GHP_UPLOAD_VERSION cargo-ghp-upload
     script:
@@ -53,7 +53,7 @@ This crate will not change the contents of the uploaded directory.
 ## Customization
 
 ```
-cargo-ghp-upload 0.3.0
+cargo-ghp-upload 0.3.1
 CAD97 <[email protected]>
 Upload documentation straight to GitHub Pages, maintaining branch separation and history
 

src/main.rs

@@ -183,7 +183,7 @@ fn ghp_upload(branch: &str, origin: &str, args: &Args) -> Result<()> {
             .args(&["clone", "--verbose"])
             .args(&["--branch", &args.deploy_branch])
             .args(&["--depth", "1"])
-            .args(&[origin, &args.deploy_branch])
+            .args(&[origin, ghp_dir.to_str().unwrap()])
             .status()?;
         if !status.success() {
             // If clone fails, the remote doesn't exist