Skip to content

Ability to set deployedsha1file instead of hardcoded. Both command li… - #605

Open
KentonMurray wants to merge 1 commit into
git-ftp:masterfrom
KentonMurray:master
Open

KentonMurray wants to merge 1 commit into
git-ftp:masterfrom
KentonMurray:master

Conversation

@KentonMurray

Copy link
Copy Markdown

…ne and through config

This is a PR in response to issue: #604

It passes local tests (I did not write any additional). I don't think there's a need to update any man pages nor docs.

@mkllnk mkllnk left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

I left a couple of comments.

Comment thread git-ftp
Comment on lines -386 to +392
DEPLOYED_SHA1_FILE="$(get_config deployedsha1file "$DEPLOYED_SHA1_FILE")"
DEPLOYED_SHA1_FILE_CONFIG="$(get_config deployedsha1file)"
if [ -z "$DEPLOYED_SHA1_FILE_CONFIG" ]; then
DEPLOYED_SHA1_FILE="$(get_config deployedsha1file "$DEPLOYED_SHA1_FILE")" #If none in config, rerun with harcoded value
else
DEPLOYED_SHA1_FILE=$DEPLOYED_SHA1_FILE_CONFIG
fi

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't understand this change. The old line should have done exactly the same. If the config variable is set then $(get_config deployedsha1file "$DEPLOYED_SHA1_FILE") will return the config option. If it's not set then it will return the original value of $DEPLOYED_SHA1_FILE.

Comment thread git-ftp
--enable-post-errors Fails if post-ftp-push hook raises an error
--disable-epsv Tell curl to disable the use of the EPSV command when doing passive FTP transfers. Curl will normally always first attempt to use EPSV before PASV, but with this option, it will not try using EPSV.
--auto-init Automatically run init action when running push action
--deployedsha1file The name of the file that keeps the SHA1 hash of the current git commit

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The formatting is a bit off here.

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants