Allow git-secret to run from any directory in the work tree #56
Conversation
|
Thanks! That's a good idea. But I have some minor comments. |
| @@ -4,9 +4,12 @@ set -e | |||
|
|
|||
| function _check_setup { | |||
| # Checking git and secret-plugin setup: | |||
| if [[ ! -d ".git" ]] || [[ ! -d ".git/hooks" ]]; then | |||
| set +e | |||
There was a problem hiding this comment.
We use set -e in all our code, I guess there's no reason to break the rule here.
| @@ -4,9 +4,12 @@ set -e | |||
|
|
|||
| function _check_setup { | |||
| # Checking git and secret-plugin setup: | |||
| if [[ ! -d ".git" ]] || [[ ! -d ".git/hooks" ]]; then | |||
| set +e | |||
| git rev-parse --is-inside-work-tree >/dev/null 2>&1 | |||
There was a problem hiding this comment.
It is better to move this function into utils. I guess it could be named _is_inside_git_tree.
And call it here like local is_tree = $(_is_inside_git_tree)
So, the tasks are:
- Move this function into
utilsfile andgitsection - Test it, both scenarios: inside and outside
| if [[ ! -d ".git" ]] || [[ ! -d ".git/hooks" ]]; then | ||
| set +e | ||
| git rev-parse --is-inside-work-tree >/dev/null 2>&1 | ||
| if [ $? != 0 ]; then |
There was a problem hiding this comment.
And here we can work with is_tree variable initialized above.
|
Sorry for the failing build, I should fix the building process on OS X. |
|
Thanks for the review comments. I've made the changes you suggested. The _is_in_git_tree function now lives in the # VCS section in the _utils/_git_secret_tools.sh and the set +e has been removed. |
|
Done! Thanks again. I am planning to make a new release just around the New Year. |
Hi, this allows git-secret to work from any working directory in the git repository. The .gitsecret directory remains in the working directory allowing users to have more than one .gitsecret in the repo.
This will result in a small change of behaviour. If a user runs git-secret from the non-root of the repo' instead of exiting with 'not a repo' error it will exit with '.gitsecret directory not found'.