Hylke Bons
55c4e5e32e
sparkles git: Replace hardcoded 'master' string
2020-06-23 17:18:11 +02:00
Maxime “pep” Buquet
feb4e3d850
Prevent blocking on interactive $EDITOR
...
It happens that when merging, git calls out an interactive $EDITOR and
waits for user input. This causes SparkleShare to block as well.
Signed-off-by: Maxime “pep” Buquet <pep@collabora.com>
2018-10-05 17:41:20 +01:00
Hylke Bons
6379e31b3c
git repo: Make sure Git LFS is always set up
2018-07-14 19:30:19 +01:00
Hylke Bons
9c1e6d8f7a
sparkles: Rename Git source files
2018-07-14 19:30:19 +01:00
Hylke Bons
14759b5fa9
linux: Use 'gio set' instead of deprecated gvfs-set-attribute
2018-07-14 19:30:19 +01:00
Hylke Bons
31e5daf720
linux: Rename icons to work in AppIndicator
2018-07-14 19:30:19 +01:00
Hylke Bons
ecf1d9df60
linux: Fix icon theme
2018-07-14 19:30:19 +01:00
Hylke Bons
d4536dfd62
repo git: Pass commit message by file based on work by Emil Velikov ( #1852 )
2018-06-21 09:10:16 +01:00
Hylke Bons
df6cb3a77d
repo git: Remove no longer needed string conversions
2018-06-16 12:45:24 +01:00
Hylke Bons
99e188db8f
git fetcher: Chmod pre-push hook after clone
2018-06-16 12:45:24 +01:00
Hylke Bons
bde443481f
git fetcher: Update comment
2018-06-16 12:45:24 +01:00
Hylke Bons
e37032b533
git: Don't let Git read other global or local configuration
2018-06-16 12:45:24 +01:00
Hylke Bons
99b6761acf
repo git: Only run chmod for pre-push hook on non-Windows
2018-06-16 12:45:24 +01:00
Hylke Bons
214a383923
repo git: Always make sure LFS pre-push hook is executable
2018-06-16 12:45:24 +01:00
Hylke Bons
6f173be21b
repo git: Remove no longer needed commit message preparing
2018-06-15 17:45:34 +01:00
Hylke Bons
0813af3494
repo git: Fix whitespace
2018-06-15 17:44:40 +01:00
Hylke Bons
8ba4bfb5e7
repo git: Better variable names
2018-06-15 17:44:12 +01:00
Hylke Bons
f6b413ca8e
repo git: Use commit message from file to avoid command line conflicts
2018-06-15 17:42:16 +01:00
Hylke Bons
4e0dff6956
repo git: Create size store files when they don't exist yet
2018-05-11 08:21:27 +01:00
Hylke Bons
307ed338c8
mac: Use descriptive arguments for some methods
2018-04-14 12:21:56 +01:00
Ivan Malison
453841d9da
Remove trailing whitespace
2018-04-08 20:41:59 -07:00
Hylke Bons
1369ac07b4
More accurate/pretty OS detection
2018-03-14 16:11:49 +00:00
Hylke Bons
f308216bbc
Always collect exceptions instead of swallowing them
2018-03-10 19:22:37 +00:00
Hylke Bons
dd0e3d36f7
git repo: Make sure to close file stream
2018-03-10 12:25:44 +00:00
Hylke Bons
dd97d564be
git repo: Simplify log parsing logic
2018-02-25 16:12:23 +00:00
Hylke Bons
8eb4fdf28f
Fix some whitespace
2018-02-24 20:47:42 +00:00
Hylke Bons
65edbd26a6
repo git: Fix and tidy up log parsing
2018-02-24 20:38:46 +00:00
Hylke Bons
c7cc2680aa
Merge pull request #1813 from hbons/fix/event-log
...
fix/event-log
2018-02-23 20:37:54 +00:00
Hylke Bons
89849b8014
sparkles git: Fix git log parsing for new versions of git
2018-02-23 20:23:46 +00:00
Hylke Bons
72f3b5b8f9
Destroy autotools with fire
2018-02-21 08:55:10 +00:00
Hylke Bons
0a144e3fde
build: Initial meson files
2018-02-21 08:54:29 +00:00
Hylke Bons
cf3b6a032e
repo git: Mark unsynced changes to upload after conflict resolution
2017-12-16 18:17:16 +01:00
Hylke Bons
c85074b573
repo git: Fix wrong conflicted version being recovered since migration from rebase to merge
2017-12-16 18:16:21 +01:00
Hylke Bons
8c8a5a460e
git repo: Keep original plus both diverging versions on conflicts. Closes #1716
2017-12-16 17:56:13 +01:00
Hylke Bons
f737a5bcc3
repo git: Move conflicted files to right subfolder. Fixes #1736
2017-12-16 14:52:38 +01:00
Hylke Bons
7aaf245675
Fix some whitespace
2017-09-25 22:10:33 +01:00
Hylke Bons
1689ca8593
Change my email address
2017-07-23 13:47:54 +01:00
Hylke Bons
c3da354abd
Merge pull request #1757 from BarryThePenguin/windows-release
...
windows: add debug and release configuration
2017-04-17 09:47:35 +01:00
Hylke Bons
f798b534e5
sparkles: Add whitespace
2017-04-17 08:50:31 +01:00
Jonathan Haines
93b5125b69
windows: add debug and release configuration
2017-04-16 14:11:38 +10:00
Hylke Bons
73f472e997
command: Move Git logic out of SSH and derive from SSH command
2017-04-15 12:19:50 +01:00
Kévin LEMELE
d299c78bc8
Removed unused import + format
2017-03-14 18:12:02 +01:00
Jonathan Haines
a6908b607e
windows
2017-03-13 15:45:47 +01:00
Hylke Bons
a04a4df3ad
fetcher git: Fix crash when no ID file in existing repo
2017-03-01 20:33:50 +00:00
Hylke Bons
ee1a65cb68
repo git: Encrypt user names and emails in history
2017-02-03 01:06:20 +00:00
Hylke Bons
41b4fa390d
repo git: Don't show commits by SparkleShare in history
2017-02-03 01:05:00 +00:00
Hylke Bons
91a3a79693
repo git: Resolve conflicts with SparkleShare as author
2017-02-03 01:03:01 +00:00
Hylke Bons
8fd165bd35
git fetcher: Define branch variables up front
2017-02-02 22:57:05 +00:00
Hylke Bons
a6e6b99d25
git fetcher: Always make sure .git/info/ exists
2017-02-02 22:54:57 +00:00
Hylke Bons
b70b40a8ff
fetcher git: Don't add user info to initial commit
2017-02-02 22:53:57 +00:00