lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #585 from github/sinbad-pre-push-exit-code

Browse Source 
Extend #582 with more tests
This commit is contained in:
risk danger olson 2015-08-14 10:00:34 -06:00
commit 5214daa46b
5 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
commands/command_init.go
View File

@ -31,13 +31,12 @@ func initCommand(cmd *cobra.Command, args []string) {
initHooksCommand(cmd, args)
}
Print("Git LFS initialized")
Print("Git LFS initialized.")
}
func initHooksCommand(cmd *cobra.Command, args []string) {
if err := lfs.InstallHooks(false); err != nil {
Error(err.Error())
}
updateForce = forceInit
updateCommand(cmd, args)
}
func init() {

8
commands/command_update.go
View File

@ -18,18 +18,12 @@ var (
// updateCommand is used for updating parts of Git LFS that reside under
// .git/lfs.
func updateCommand(cmd *cobra.Command, args []string) {
updatePrePushHook()
}
// updatePrePushHook will force an update of the pre-push hook.
func updatePrePushHook() {
if err := lfs.InstallHooks(updateForce); err != nil {
Error(err.Error())
Print("Run `git lfs update --force` to overwrite this hook.")
} else {
Print("Updated pre-push hook")
Print("Updated pre-push hook.")
}
}
func init() {

4
lfs/setup.go
View File

@ -17,11 +17,13 @@ var (
valueRegexp = regexp.MustCompile("\\Agit[\\-\\s]media")
NotInARepositoryError = errors.New("Not in a repository")
prePushHook = "#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 0; }\ngit lfs pre-push \"$@\""
prePushHook = "#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\\n\"; exit 2; }\ngit lfs pre-push \"$@\""
prePushUpgrades = map[string]bool{
"#!/bin/sh\ngit lfs push --stdin $*": true,
"#!/bin/sh\ngit lfs push --stdin \"$@\"": true,
"#!/bin/sh\ngit lfs pre-push \"$@\"": true,
"#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 0; }\ngit lfs pre-push \"$@\"": true,
"#!/bin/sh\ncommand -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 2; }\ngit lfs pre-push \"$@\"": true,
}
)

44
test/test-init.sh
View File

@ -41,3 +41,47 @@ begin_test "init with old settings"
[ "git-lfs clean %f" = "$(git config filter.lfs.clean)" ]
)
end_test
begin_test "init updates repo hooks"
(
set -e
mkdir init-repo-hooks
cd init-repo-hooks
git init
pre_push_hook="#!/bin/sh
command -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\\n\"; exit 2; }
git lfs pre-push \"\$@\""
[ "Updated pre-push hook.
Git LFS initialized." = "$(git lfs init)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook
# more-comprehensive hook update tests are in test-update.sh
echo "#!/bin/sh
git lfs push --stdin \$*" > .git/hooks/pre-push
[ "Updated pre-push hook.
Git LFS initialized." = "$(git lfs init)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# don't replace unexpected hook
expected="Hook already exists: pre-push
test
Run \`git lfs update --force\` to overwrite this hook.
Git LFS initialized."
echo "test" > .git/hooks/pre-push
[ "test" = "$(cat .git/hooks/pre-push)" ]
[ "$expected" = "$(git lfs init 2>&1)" ]
[ "test" = "$(cat .git/hooks/pre-push)" ]
# force replace unexpected hook
[ "Updated pre-push hook.
Git LFS initialized." = "$(git lfs init --force)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
)
end_test

28
test/test-update.sh
View File

@ -7,36 +7,50 @@ begin_test "update"
set -e
pre_push_hook="#!/bin/sh
command -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 0; }
command -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository is configured for Git LFS but 'git-lfs' was not found on your path. If you no longer wish to use Git LFS, remove this hook by deleting .git/hooks/pre-push.\\n\"; exit 2; }
git lfs pre-push \"\$@\""
mkdir without-pre-push
cd without-pre-push
git init
[ "Updated pre-push hook" = "$(git lfs update)" ]
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# run it again
[ "Updated pre-push hook" = "$(git lfs update)" ]
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook 1
echo "#!/bin/sh
git lfs push --stdin \$*" > .git/hooks/pre-push
[ "Updated pre-push hook" = "$(git lfs update)" ]
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook 2
echo "#!/bin/sh
git lfs push --stdin \"\$@\"" > .git/hooks/pre-push
[ "Updated pre-push hook" = "$(git lfs update)" ]
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook 3
echo "#!/bin/sh
git lfs pre-push \"\$@\"" > .git/hooks/pre-push
[ "Updated pre-push hook" = "$(git lfs update)" ]
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook 4
echo "#!/bin/sh
command -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 0; }
git lfs pre-push \"$@\""
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# replace old hook 5
echo "#!/bin/sh
command -v git-lfs >/dev/null 2>&1 || { echo >&2 \"\\nThis repository has been set up with Git LFS but Git LFS is not installed.\\n\"; exit 2; }
git lfs pre-push \"$@\""
[ "Updated pre-push hook." = "$(git lfs update)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
# don't replace unexpected hook
@ -51,7 +65,7 @@ Run \`git lfs update --force\` to overwrite this hook."
[ "test" = "$(cat .git/hooks/pre-push)" ]
# force replace unexpected hook
[ "Updated pre-push hook" = "$(git lfs update --force)" ]
[ "Updated pre-push hook." = "$(git lfs update --force)" ]
[ "$pre_push_hook" = "$(cat .git/hooks/pre-push)" ]
)
end_test