Skip to content

Option to keep gitattributes from target branch #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Option to keep gitattributes from target branch #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f57d6e
add option to keep gitattributes file
grossqx Apr 19, 2024
8aec05a
remove one check, add log
grossqx Apr 19, 2024
082e18d
Temp fix for git-lfs issue 5749
grossqx Jun 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ inputs:
[Optional] create target branch if not exist. Defaults to `false`
default: false
required: false
keep-gitattributes:
type: boolean
description: >-
[Optional] If true, .gitattributes will not be overwritten. Required for LFS in target repo. Defaults to `false`
default: false
required: false

runs:
using: docker
Expand All @@ -71,6 +77,7 @@ runs:
- '${{ inputs.commit-message }}'
- '${{ inputs.target-directory }}'
- '${{ inputs.create-target-branch-if-needed }}'
- '${{ inputs.keep-gitattributes }}'
branding:
icon: git-commit
color: green
12 changes: 12 additions & 0 deletions entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ TARGET_BRANCH="${9}"
COMMIT_MESSAGE="${10}"
TARGET_DIRECTORY="${11}"
CREATE_TARGET_BRANCH_IF_NEEDED="${12}"
KEEP_GITATTRIBUTES="${13}"

## Temp fix for git-lfs issue 5749
export GIT_CLONE_PROTECTION_ACTIVE=false

if [ -z "$DESTINATION_REPOSITORY_USERNAME" ]
then
Expand Down Expand Up @@ -99,6 +103,8 @@ TEMP_DIR=$(mktemp -d)
# but not anymore. Otherwise we had to remove the files from "$CLONE_DIR",
# including "." and with the exception of ".git/"
mv "$CLONE_DIR/.git" "$TEMP_DIR/.git"
mv "$CLONE_DIR/.gitattributes" "$TEMP_DIR/.gitattributes"


# $TARGET_DIRECTORY is '' by default
ABSOLUTE_TARGET_DIRECTORY="$CLONE_DIR/$TARGET_DIRECTORY/"
Expand All @@ -116,6 +122,12 @@ echo "[+] Listing root Location"
ls -al /

mv "$TEMP_DIR/.git" "$CLONE_DIR/.git"
# If enabled, restore .gitattributes file to keep LFS working.
if [ "$KEEP_GITATTRIBUTES" = "true" ]
then
echo "[+] Restoring .gitattributes file"
mv "$TEMP_DIR/.gitattributes" "$CLONE_DIR/.gitattributes"
fi

echo "[+] List contents of $SOURCE_DIRECTORY"
ls "$SOURCE_DIRECTORY"
Expand Down