summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* rebase on top of updated original branchGravatar Joey Hess2016-03-03
|
* fix abs filepath generationGravatar Joey Hess2016-03-03
|
* change name of adjusted branches to eg adjusted/master(unlocked)Gravatar Joey Hess2016-03-03
| | | | | | | Using adjusted/unlocked/master made lots of git stuff dealing with "master" complain that it was ambiguous. This new appoach is more like view branch names, and shows the adjustment right there in the branch display even if only the basename of the branch is shown.
* working toward adjusted commit propigationGravatar Joey Hess2016-03-03
|
* Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-03
|\
* | can't checkout adjusted branch while index is still lockedGravatar Joey Hess2016-03-03
| | | | | | | | | | | | | | There's a race here, but entering an adjusted branch for the first time is not something to do when a commit is being made at the same time. Although, may want to prevent the assistant from committing while entering the adjusted branch.
* | push original branch, not adjusted branchGravatar Joey Hess2016-03-03
| |
| * fix windows buildGravatar Joey Hess2016-03-03
| |
* | replicate git's message about an existing lock fileGravatar Joey Hess2016-03-03
| |
* | lock index while making index-less commitsGravatar Joey Hess2016-03-03
| | | | | | | | | | Avoids race with another git commit at the same time adjusted branch is being updated.
* | support for git-style lock files, on unix and windowsGravatar Joey Hess2016-03-03
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-03-03
| |\
| * | fix windows buildGravatar Joey Hess2016-03-03
| | |
| | * (no commit message)Gravatar Horus2016-03-03
| | |
| | * (no commit message)Gravatar frederik@ffbea6a549cb3f460d110386c0f634c1ddc6a68a2016-03-03
| | |
| | * (no commit message)Gravatar chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b2016-03-03
| | |
| | * (no commit message)Gravatar chip@9a7a3f3780ecacd7b38b0b0adad50046c9b2895b2016-03-03
| | |
| | * Added a comment: ThanksGravatar mih2016-03-02
| |/
| * commentGravatar Joey Hess2016-03-02
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-03-02
| |\
| * | Fix metadata hook behavior when multiple files are added at once. Thanks, ↵Gravatar Joey Hess2016-03-02
| | | | | | | | | | | | Klaus Ethgen.
| | * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| |/
| * followupGravatar Joey Hess2016-03-01
| |
| * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| |
| * updateGravatar Joey Hess2016-03-01
| |
| * followupGravatar Joey Hess2016-03-01
| |
| * commentGravatar Joey Hess2016-03-01
| |
| * clarifyGravatar Joey Hess2016-03-01
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-03-01
| |\
| * | Fix shared lock file FD leak.Gravatar Joey Hess2016-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes behavior in this situation: l1 <- lockShared Nothing "lck" l2 <- lockShared Nothing "lck" dropLock l1 dropLock l2 Before, the lock was dropped upon the second dropLock call, but the fd remained open, and would never be closed while the program was running. Fixed by a rather round-about method, but it should work well enough. It would have been simpler to open open the shared lock once, and not open it again in the second call to lockShared. But, that's difficult to do atomically. This also affects Windows and PID locks, not just posix locks. In the case of pid locks, multiple calls to waitLock within the same process are allowed because the side lock is locked using a posix lock, and so multiple exclusive locks can be taken in the same process. So, this change fixes a similar problem with pid locks. l1 <- waitLock (Seconds 1) "lck" l2 <- waitLock (Seconds 1) "lck" dropLock l1 dropLock l2 Here the l2 side lock fd remained open but not locked, although the pid lock file was removed. After this change, the second dropLock will close both fds to the side lock, and delete the pidlock.
| | * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| | |
| | * Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| | |
| | * Added a comment: recent snapshot seems has fixed itGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| | |
| * | commentGravatar Joey Hess2016-03-01
| | |
| | * Added a comment: more infoGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| |/
| * moreinfoGravatar Joey Hess2016-03-01
| |
| * Fix bug preventing moving files to/from a repository with annex.pidlock set.Gravatar Joey Hess2016-03-01
| |
| * comment typo fixGravatar Joey Hess2016-03-01
| |
| * Fix data loss that can occur when annex.pidlock is set in a repository.Gravatar Joey Hess2016-03-01
| |
| * commentGravatar Joey Hess2016-03-01
| |
| * commentGravatar Joey Hess2016-03-01
| |
| * reopenGravatar Joey Hess2016-03-01
| |
| * commentGravatar Joey Hess2016-03-01
| |
| * Added a comment: similar problemGravatar bvaa2016-03-01
| |
| * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-03-01
| |
| * initial whiningGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| |
| * (no commit message)Gravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-03-01
| |
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-02-29
| |\
| * | devblogGravatar Joey Hess2016-02-29
| | |
* | | need to update masterGravatar Joey Hess2016-02-29
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-14 20:04:50 +0000