diff options
Diffstat (limited to 'meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch')
| -rw-r--r-- | meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch new file mode 100644 index 0000000000..b6d40dbc9f --- /dev/null +++ b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch @@ -0,0 +1,46 @@ +guilt: allow operation outside of git repos + +Sometimes guilt is sourced when there isn't a containing git repository. +Some of the git commands that are always called will report errors +unecesarility in this scenario. This adds a variable that will inhibit +those problematic calls + +Signed-off-by <bruce.ashfield@windriver.com> + +--- + + guilt | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + + +--- a/guilt ++++ b/guilt +@@ -23,7 +23,9 @@ esac + # we change directories ourselves + SUBDIRECTORY_OK=1 + +-. "$(git --exec-path)/git-sh-setup" ++if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then ++ . "$(git --exec-path)/git-sh-setup" ++fi + + # + # Git version check +@@ -921,14 +923,15 @@ diffstat=`git config --bool guilt.diffst + # The following gets run every time this file is source'd + # + +- + # GUILT_DIR="$GIT_DIR/patches" + if [ -z "$GUILT_BASE" ]; then + GUILT_BASE=wrs + fi + GUILT_DIR="$GUILT_BASE/patches" + +-branch=`get_branch` ++if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then ++ branch=`get_branch` ++fi + + # most of the time we want to verify that the repo's branch has been + # initialized, but every once in a blue moon (e.g., we want to run guilt-init), |