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 | 48 |
1 files changed, 0 insertions, 48 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 deleted file mode 100644 index c912397e5a..0000000000 --- a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | guilt: allow operation outside of git repos | ||
2 | |||
3 | Sometimes guilt is sourced when there isn't a containing git repository. | ||
4 | Some of the git commands that are always called will report errors | ||
5 | unecesarility in this scenario. This adds a variable that will inhibit | ||
6 | those problematic calls | ||
7 | |||
8 | Upstream-Status: Inappropriate [oe-specific] | ||
9 | |||
10 | Signed-off-by <bruce.ashfield@windriver.com> | ||
11 | |||
12 | --- | ||
13 | |||
14 | guilt | 9 ++++++--- | ||
15 | 1 file changed, 6 insertions(+), 3 deletions(-) | ||
16 | |||
17 | |||
18 | --- a/guilt | ||
19 | +++ b/guilt | ||
20 | @@ -23,7 +23,9 @@ esac | ||
21 | # we change directories ourselves | ||
22 | SUBDIRECTORY_OK=1 | ||
23 | |||
24 | -. "$(git --exec-path)/git-sh-setup" | ||
25 | +if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then | ||
26 | + . "$(git --exec-path)/git-sh-setup" | ||
27 | +fi | ||
28 | |||
29 | # | ||
30 | # Git version check | ||
31 | @@ -921,14 +923,15 @@ diffstat=`git config --bool guilt.diffst | ||
32 | # The following gets run every time this file is source'd | ||
33 | # | ||
34 | |||
35 | - | ||
36 | # GUILT_DIR="$GIT_DIR/patches" | ||
37 | if [ -z "$GUILT_BASE" ]; then | ||
38 | GUILT_BASE=wrs | ||
39 | fi | ||
40 | GUILT_DIR="$GUILT_BASE/patches" | ||
41 | |||
42 | -branch=`get_branch` | ||
43 | +if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then | ||
44 | + branch=`get_branch` | ||
45 | +fi | ||
46 | |||
47 | # most of the time we want to verify that the repo's branch has been | ||
48 | # initialized, but every once in a blue moon (e.g., we want to run guilt-init), | ||