Merge pull request #14 from runcommand/include-git-hash

danielbachhuber · web-flow · commit 85454c7b036a · 2016-11-09T12:10:36.000-08:00
Include the current hash in archives when version includes `-alpha`
diff --git a/command.php b/command.php
@@ -96,6 +96,14 @@
 		}
 	}
 
+	if ( false !== stripos( $version, '-alpha' ) && is_dir( $path . '/.git' ) ) {
+		$response = WP_CLI::launch( "cd {$path}; git log --pretty=format:'%h' -n 1", false, true );
+		$maybe_hash = trim( $response->stdout );
+		if ( $maybe_hash && 7 === strlen( $maybe_hash ) ) {
+			$version .= '-' . $maybe_hash;
+		}
+	}
+
 	if ( is_null( $archive_file ) ) {
 		$archive_file = dirname( $path ) . '/' . $archive_base . $version;
 		if ( 'zip' === $assoc_args['format'] ) {

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,14 @@`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ if ( false !== stripos( $version, '-alpha' ) && is_dir( $path . '/.git' ) ) {`
	`100`	`+ $response = WP_CLI::launch( "cd {$path}; git log --pretty=format:'%h' -n 1", false, true );`
	`101`	`+ $maybe_hash = trim( $response->stdout );`
	`102`	`+ if ( $maybe_hash && 7 === strlen( $maybe_hash ) ) {`
	`103`	`+ $version .= '-' . $maybe_hash;`
	`104`	`+ }`
	`105`	`+ }`
	`106`	`+`
`99`	`107`	`if ( is_null( $archive_file ) ) {`
`100`	`108`	`$archive_file = dirname( $path ) . '/' . $archive_base . $version;`
`101`	`109`	`if ( 'zip' === $assoc_args['format'] ) {`