Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/sync-upstream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,10 @@ jobs:
fi

if [ "${MERGE_RC}" -ne 0 ]; then
git add -A
# `add -u`, not `add -A`: restricts staging to tracked and unmerged
# paths, so untracked files in the runner's working tree can never
# end up in the merge commit.
git add -u
git commit --no-edit
elif [ -n "${DROPPED}" ]; then
git commit -q -m "Drop upstream workflows not used by this fork"
Expand Down Expand Up @@ -155,7 +158,8 @@ jobs:
printf '%s\n' "git fetch origin"
printf '%s\n' "git checkout ${SYNC_BRANCH}"
printf '%s\n' "git status # find conflicts, fix the <<<<<<< markers"
printf '%s\n' "git add -A && git commit"
printf '%s\n' "git add -u # -u, not -A: do not sweep in untracked files"
printf '%s\n' "git commit"
printf '%s\n' "git push"
printf '%s\n' '```'
printf '%s\n' ""
Expand Down
15 changes: 15 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# compilation output
sftpgo
sftpgo.exe

# Runtime artifacts created when the daemon or the test suite is run from the
# repo root: SFTPGo writes its default host keys into the working directory
# when no host keys are configured (internal/sftpd/server.go).
id_rsa
id_rsa.pub
id_ecdsa
id_ecdsa.pub
id_ed25519
id_ed25519.pub

# Default SQLite data provider store, created in the working directory.
sftpgo.db
sftpgo.db-shm
sftpgo.db-wal
5 changes: 0 additions & 5 deletions id_ecdsa

This file was deleted.

1 change: 0 additions & 1 deletion id_ecdsa.pub

This file was deleted.

3 changes: 0 additions & 3 deletions id_ed25519

This file was deleted.

1 change: 0 additions & 1 deletion id_ed25519.pub

This file was deleted.

39 changes: 0 additions & 39 deletions id_rsa

This file was deleted.

1 change: 0 additions & 1 deletion id_rsa.pub

This file was deleted.

Binary file removed sftpgo.db
Binary file not shown.