gitty 0.3.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/assets/helpers/hookd_wrapper +1 -1
- data/bin/git-hook +1 -1
- data/lib/gitty/commands/init.rb +2 -1
- metadata +1 -1
@@ -10,7 +10,7 @@ remote_branch=$(git show-ref origin/--hooks--)
|
|
10
10
|
[ "${remote_branch%% *}" != "$local_rev" ] && (
|
11
11
|
echo "Hook updates were applied:" 1>&2
|
12
12
|
GIT_OBJECT_DIRECTORY=../../objects git branch origin/--hooks-- ${remote_branch%% *} -f 1>&2
|
13
|
-
GIT_OBJECT_DIRECTORY=../../objects git
|
13
|
+
GIT_OBJECT_DIRECTORY=../../objects git merge ${remote_branch%% *} 1>&2
|
14
14
|
)
|
15
15
|
)
|
16
16
|
|
data/bin/git-hook
CHANGED
data/lib/gitty/commands/init.rb
CHANGED
@@ -34,7 +34,8 @@ class Gitty::HookCommand::Init < Gitty::Runner
|
|
34
34
|
cmd(*%w[git symbolic-ref HEAD refs/heads/--hooks--])
|
35
35
|
cmd(*%w[git commit --allow-empty -m initial\ commit])
|
36
36
|
end
|
37
|
-
cmd(
|
37
|
+
cmd("git reset --hard #{hooks_rev}") if hooks_rev
|
38
|
+
|
38
39
|
end
|
39
40
|
end
|
40
41
|
end
|