Re: [PATCH v3 11/25] git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

2014-02-26 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy  pclo...@gmail.com writes:

 If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be
 $GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse
 --git-path handle it.

 Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
 ---
  git-sh-setup.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/git-sh-setup.sh b/git-sh-setup.sh
 index fffa3c7..fec9430 100644
 --- a/git-sh-setup.sh
 +++ b/git-sh-setup.sh
 @@ -343,7 +343,7 @@ then
   echo 2 Unable to determine absolute path of git directory
   exit 1
   }
 - : ${GIT_OBJECT_DIRECTORY=$GIT_DIR/objects}
 + : ${GIT_OBJECT_DIRECTORY=`git rev-parse --git-path objects`}

$(...) is the preferred way over `...` in this codebase.

  fi
  
  peel_committish () {
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v3 11/25] git-sh-setup.sh: use rev-parse --git-path to get $GIT_DIR/objects

2014-02-18 Thread Nguyễn Thái Ngọc Duy
If $GIT_COMMON_DIR is set, $GIT_OBJECT_DIRECTORY should be
$GIT_COMMON_DIR/objects, not $GIT_DIR/objects. Just let rev-parse
--git-path handle it.

Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
 git-sh-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index fffa3c7..fec9430 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -343,7 +343,7 @@ then
echo 2 Unable to determine absolute path of git directory
exit 1
}
-   : ${GIT_OBJECT_DIRECTORY=$GIT_DIR/objects}
+   : ${GIT_OBJECT_DIRECTORY=`git rev-parse --git-path objects`}
 fi
 
 peel_committish () {
-- 
1.8.5.2.240.g8478abd

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html