kudu-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t...@apache.org
Subject [1/4] kudu git commit: Java: fix git worktree compatibility
Date Thu, 08 Jun 2017 21:12:37 GMT
Repository: kudu
Updated Branches:
  refs/heads/master 0c1b52fdf -> 2d30f3a96


Java: fix git worktree compatibility

The .git file is not a directory in git worktree checkouts.

A similar issue was fixed in thirdparty in 21f5ae0d53f9e.

Change-Id: I7297b3a69ccfc0a9ce9db083a478bd7e92e64dcf
Reviewed-on: http://gerrit.cloudera.org:8080/7104
Tested-by: Kudu Jenkins
Reviewed-by: Todd Lipcon <todd@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/kudu/repo
Commit: http://git-wip-us.apache.org/repos/asf/kudu/commit/3296c076
Tree: http://git-wip-us.apache.org/repos/asf/kudu/tree/3296c076
Diff: http://git-wip-us.apache.org/repos/asf/kudu/diff/3296c076

Branch: refs/heads/master
Commit: 3296c076d19538f27e012e724ad5b26fec147b9b
Parents: 0c1b52f
Author: Dan Burkert <danburkert@apache.org>
Authored: Wed Jun 7 10:31:13 2017 -0700
Committer: Todd Lipcon <todd@apache.org>
Committed: Wed Jun 7 19:07:28 2017 +0000

----------------------------------------------------------------------
 .../src/test/java/org/apache/kudu/client/TestUtils.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kudu/blob/3296c076/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
----------------------------------------------------------------------
diff --git a/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java b/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
index e9a74a4..e3e0622 100644
--- a/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
+++ b/java/kudu-client/src/test/java/org/apache/kudu/client/TestUtils.java
@@ -108,7 +108,7 @@ public class TestUtils {
    */
   private static File findParentGitDir(File dir) {
     while (dir != null) {
-      if (new File(dir, ".git").isDirectory()) {
+      if (new File(dir, ".git").exists()) {
         return dir;
       }
       dir = dir.getParentFile();


Mime
View raw message