Joey Hess
2ff8915365
fix
2011-11-08 12:24:56 -04:00
Joey Hess
67c9f84a1f
fix broken links
2011-11-08 12:23:03 -04:00
Joey Hess
faa4935047
Handle a case where an annexed file is moved into a gitignored directory, by having fix --force add its change.
2011-11-07 18:10:31 -04:00
gernot
26d3c3b497
2011-11-07 20:55:54 +00:00
Joey Hess
c99fb58909
merge: Use fast-forward merges when possible.
...
Thanks Valentin Haenel for a test case showing how non-fast-forward merges
could result in an ongoing pull/merge/push cycle.
While the git-annex branch is fast-forwarded, git-annex's index file is still
updated using the union merge strategy as before. There's no other way to
update the index that would be any faster.
It is possible that a union merge and a fast-forward result in different file
contents: Files should have the same lines, but a union merge may change
their order. If this happens, the next commit made to the git-annex branch
will have some unnecessary changes to line orders, but the consistency
of data should be preserved.
Note that when the journal contains changes, a fast-forward is never attempted,
which is fine, because committing those changes would be vanishingly unlikely
to leave the git-annex branch at a commit that already exists in one of
the remotes.
The real difficulty is handling the case where multiple remotes have all
changed. git-annex does find the best (ie, newest) one and fast forwards
to it. If the remotes are diverged, no fast-forward is done at all. It would
be possible to pick one, fast forward to it, and make a merge commit to
the rest, I see no benefit to adding that complexity.
Determining the best of N changed remotes requires N*2+1 calls to git-log, but
these are fast git-log calls, and N is typically small. Also, typically
some or all of the remote refs will be the same, and git-log is not called to
compare those. In the real world I expect this will almost always add only
1 git-log call to the merge process. (Which already makes N anyway.)
2011-11-06 15:22:40 -04:00
Valentin_Haenel
526c20d068
add bug report
2011-11-05 16:31:18 +00:00
Joey Hess
3d3e1c4c25
better command name
2011-10-31 15:18:41 -04:00
Joey Hess
380839299e
The fromkey command now takes the key as its first parameter. The --key option is no longer used.
2011-10-31 12:56:07 -04:00
Joey Hess
56080a0feb
closures
2011-10-30 16:44:09 -04:00
Joey Hess
ee71564754
add command name to some output
2011-10-30 16:38:48 -04:00
Joey Hess
506282399c
Merge branch 'master' of ssh://git-annex.branchable.com
2011-10-29 18:11:25 -04:00
Joey Hess
2566eb85fe
fsck: Now works in bare repositories.
...
Checks location log information, and file contents.
Does not check that numcopies is satisfied, as .gitattributes information
about numcopies is not available in a bare repository. In practice, that
should not be a problem, since fsck is also run in a checkout and will
check numcopies there.
2011-10-29 18:03:28 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
a183487cd5
2011-10-29 21:36:06 +00:00
Joey Hess
36f63ab19e
getting tired of repeating myself
2011-10-29 16:21:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
3f32216178
2011-10-29 20:02:21 +00:00
Joey Hess
a93aa2e51e
responsen
2011-10-29 15:46:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
b7d2fd8186
2011-10-29 19:09:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
d46b8c053e
Added a comment
2011-10-29 18:28:14 +00:00
Joey Hess
0d92aca1aa
responsen
2011-10-29 14:17:02 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
75e99b16f9
2011-10-29 17:45:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
e9d142e9e8
2011-10-29 17:27:48 +00:00
Joey Hess
0dfe750c0b
close
2011-10-29 13:21:28 -04:00
Joey Hess
ad3b462214
sheesh. seriously?
2011-10-29 13:17:37 -04:00
Joey Hess
158fd0d908
Merge branch 'master' of ssh://git-annex.branchable.com
2011-10-29 13:16:56 -04:00
Joey Hess
978ab987d5
pebak
2011-10-29 13:16:10 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
3868a65663
2011-10-29 17:07:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
36355e815e
Added a comment
2011-10-29 17:03:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
39c304be43
2011-10-29 16:57:10 +00:00
Joey Hess
4d7802bff7
responsen
2011-10-29 12:45:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
0dcbe51ed2
2011-10-29 15:36:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
ce4029c973
Added a comment
2011-10-29 15:30:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
7588b042da
2011-10-29 15:27:06 +00:00
Joey Hess
6c31e3a8c3
drop --from is now supported to remove file content from a remote.
2011-10-28 17:26:38 -04:00
Joey Hess
2888562724
update
2011-10-27 18:59:25 -04:00
Joey Hess
66194684ac
uninit: Add guard against being run with the git-annex branch checked out.
2011-10-27 15:47:11 -04:00
Joey Hess
f84d66fa15
reap in onLocal
...
Each onLocal call involves a new Annex state, so needs to clean up after it.
2011-10-27 14:55:07 -04:00
http://joey.kitenet.net/
48d39dd354
Added a comment
2011-10-27 17:13:44 +00:00
http://joey.kitenet.net/
2aa1c779ef
Added a comment
2011-10-27 17:09:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
5bc132b95c
2011-10-27 16:33:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnBJ6Dv1glxzzi4qIzGFNa6F-mfHIvv9Ck
c3df1c82b9
2011-10-27 16:31:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c5c682c131
Added a comment
2011-10-26 18:22:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c65293977e
Added a comment
2011-10-26 17:16:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c37a70fbbc
2011-10-26 15:49:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
c8fdffa9f8
2011-10-26 15:46:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
962fed915f
Added a comment
2011-10-23 15:00:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
721f236e3a
2011-10-23 14:37:33 +00:00
Joey Hess
f011033869
add timestamps to remote.log
2011-10-06 16:07:58 -04:00
Joey Hess
f929d0229c
Add timestamps to trust.log.
2011-10-06 15:55:50 -04:00
Joey Hess
3e0d2a0803
add timestamp to uuid.log
...
* New or changed repository descriptions in uuid.log now have a timestamp,
which is used to ensure the newest description is used when the uuid.log
has been merged.
* Note that older versions of git-annex will display the timestamp as part
of the repository description, which is ugly but otherwise harmless.
2011-10-06 15:31:25 -04:00
Joey Hess
e139a99aa0
investigated file formats; appending timestamp should preserve back-compat
2011-10-05 16:35:01 -04:00
Joey Hess
c199a01dd1
bug
2011-10-05 15:59:49 -04:00
Joey Hess
d357556141
Add locking to avoid races when changing the git-annex branch.
2011-10-03 16:32:36 -04:00
Joey Hess
6dfb94b2d7
update
2011-10-03 14:48:04 -04:00
Joey Hess
244ffef43f
add
2011-09-29 16:43:00 -04:00
Joey Hess
ca4eb842a4
add json to build scripts
2011-09-06 14:36:21 -04:00
Joey Hess
92f490383a
Merge branch 'master' of ssh://git-annex.branchable.com
2011-09-06 14:35:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl0-EtQjVUNysjom6sTlQxRUwkwD6uPx88
fcfd2776cb
2011-09-06 18:27:08 +00:00
Joey Hess
07125dca53
Improve display of newlines around error and warning messages.
2011-09-06 13:46:08 -04:00
Joey Hess
cb5dacfd40
rsync and wget use stderr for progress, so no problem
2011-09-01 16:15:57 -04:00
Joey Hess
e4a74c0dc5
close bug with some caveats
2011-09-01 16:11:21 -04:00
http://jefferai.org/
baa43cb9c0
2011-08-30 20:56:44 +00:00
Joey Hess
b26ee162f3
guess not everyone configures their shell to show nonzero exit codes..
2011-08-27 12:34:02 -04:00
http://peter-simons.myopenid.com/
9170e1b87d
2011-08-26 10:55:43 +00:00
http://joey.kitenet.net/
cde8221051
Added a comment
2011-08-17 04:56:30 +00:00
Joey Hess
e6752cc064
Added support for getting content from git remotes using http (and https).
2011-08-16 21:12:48 -04:00
Joey Hess
c04f1f4c30
response
2011-08-16 16:11:55 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4
c3f74c6959
2011-08-15 18:19:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkHscTHMCNvjJ6nLI1VpsBrJFI5FTwhUT4
9f719e5674
2011-08-15 18:18:22 +00:00
http://christian.amsuess.com/chrysn
18012c7ec8
enhancement suggestion
2011-08-12 13:09:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
20a8f8c85b
2011-08-09 13:04:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
1e934c29d6
2011-08-09 13:02:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm4or5sJLWB0evPKp70Q2OND-JmFPnOkLA
065e1a507b
2011-08-09 13:00:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
614d8f9856
Added a comment
2011-08-08 09:04:21 +00:00
Joey Hess
46ddb4e66a
response
2011-08-05 10:29:21 -04:00
Joey Hess
578e669964
response
2011-08-05 10:27:22 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
a746623a33
2011-08-01 09:54:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmFgsNxmnGznb5bbmcoWhoQOoxZZ-io61s
b48fec3846
2011-08-01 09:52:22 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
ad4528cce8
2011-07-31 01:20:35 +00:00
Joey Hess
45bbf210a1
Fix shell escaping in rsync special remote.
2011-07-29 15:28:21 +02:00
https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE
50edbb03eb
2011-07-28 17:40:53 +00:00
Joey Hess
13187b1ba7
close
2011-07-15 12:55:05 -04:00
Joey Hess
39ae33386d
update
2011-07-15 12:53:58 -04:00
Joey Hess
7fa7601490
response
2011-07-15 12:51:06 -04:00
http://peter-simons.myopenid.com/
185f0b6870
2011-07-15 15:33:35 +00:00
Joey Hess
ded2591124
unannex: Clean up use of git commit -a.
...
This was more complex than would be expected. unannex has to use git commit -a
since it's removing files from git; git commit filelist won't do.
Allow commands to be added to the Git queue that have no associated files,
and run such commands once.
2011-07-14 17:15:37 -04:00
http://peter-simons.myopenid.com/
020787bb97
2011-07-14 12:15:42 +00:00
Joey Hess
c38dd9adc8
analysis
2011-07-10 15:37:29 -04:00
Joey Hess
7919de73af
Bugfix: Make add ../ work.
...
The complication of check-attr returning absolute paths that have to be
converted back to relative paths..
2011-07-10 13:52:53 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
085eeaa652
2011-07-09 01:49:09 +00:00
http://joey.kitenet.net/
151b1d85c7
Added a comment
2011-07-08 01:32:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
4857f4e861
Added a comment
2011-07-08 00:45:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
9633deab57
Added a comment: this happens also when the user has not the permission to set the file mode
2011-07-08 00:21:32 +00:00
Joey Hess
67dcc1f171
add: Avoid a failure mode that resulted in the file seemingly being deleted (content put in the annex but no symlink present).
2011-07-07 19:29:36 -04:00
Joey Hess
ff531b9677
Merge branch 'master' of ssh://git-annex.branchable.com
2011-07-07 17:05:53 -04:00
http://joey.kitenet.net/
dac158c7b2
Added a comment
2011-07-07 21:04:23 +00:00
http://joey.kitenet.net/
0c52362359
Added a comment
2011-07-07 20:27:33 +00:00
ssqq
33ebaf3f9f
2011-07-07 19:45:31 +00:00
ssqq
1ffe7f7770
2011-07-07 19:44:40 +00:00
ssqq
944cc2fde8
2011-07-07 18:49:49 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
8da1dd0336
2011-07-07 11:08:35 +00:00
https://lithitux.org/openidserver/users/pavel
10e72acb01
Added a comment
2011-07-06 08:14:26 +00:00
http://joey.kitenet.net/
fb433a5ba2
Added a comment
2011-07-05 19:06:48 +00:00
http://joey.kitenet.net/
502bac1c71
Added a comment
2011-07-05 18:37:21 +00:00
Joey Hess
82eb082ab9
my fix is confirmed to have worked
...
Also audited for other uses of pipeBoth and hPipeBoth and they mostly seem
safe.
2011-07-05 14:36:21 -04:00
http://joey.kitenet.net/
5070340ca7
Added a comment
2011-07-05 17:31:22 +00:00
https://lithitux.org/openidserver/users/pavel
bddbb66ea4
Added a comment: "Me too"
2011-07-05 15:54:21 +00:00
http://joey.kitenet.net/
0ef0f277c1
Added a comment
2011-07-04 22:58:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
9869ebb260
2011-07-04 22:54:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmJfIszzreLNvCqzqzvTayA9_9L6gb9RtY
02f2c744bd
Added a comment
2011-07-04 20:25:39 +00:00
Joey Hess
71c783bf24
uninit: Use unannex in --fast mode, to support unannexing multiple files that link to the same content.
2011-07-04 16:20:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
18d82459c6
Added a comment
2011-07-04 16:57:26 +00:00
http://joey.kitenet.net/
109814d8bb
Comment moderation
2011-07-04 16:29:40 +00:00
Joey Hess
bd54dadb0b
response
2011-07-04 12:27:47 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
d97cc2fd52
Added a comment
2011-07-03 11:56:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
3904d2e4b9
2011-07-03 11:32:17 +00:00
Joey Hess
af45d42224
Merge branch 'master' into v3
...
Conflicts:
debian/changelog
2011-06-29 11:42:35 -04:00
Joey Hess
b3aaf980e4
--force will cause add, etc, to operate on ignored files.
2011-06-29 11:42:00 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w
fb7663ceb8
2011-06-29 14:46:41 +00:00
Joey Hess
9672496a93
update
2011-06-23 08:49:54 -04:00
Joey Hess
c7a1690f02
update
2011-06-22 17:56:07 -04:00
Joey Hess
9f9e17aa0f
unlock: Made atomic.
2011-06-20 22:38:18 -04:00
Joey Hess
53706ad9bf
move bug report
2011-06-20 22:29:46 -04:00
Joey Hess
64d6520704
git is slow
2011-06-14 19:05:45 -04:00
http://christian.amsuess.com/chrysn
f4609a5d28
minor bug report
2011-06-14 17:01:13 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
056a784f3d
2011-06-13 18:09:58 +00:00
Joey Hess
eb5fbc4cb9
response
2011-06-13 13:03:23 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
eb8ecd857d
Added a comment
2011-06-13 16:58:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
a85e9b1276
2011-06-13 16:57:19 +00:00
http://joey.kitenet.net/
8da84d8860
Added a comment
2011-06-10 16:46:03 +00:00
http://joey.kitenet.net/
68ed12eab4
Added a comment
2011-06-10 16:41:43 +00:00
http://joey.kitenet.net/
ef6209db43
Comment moderation
2011-06-10 16:39:45 +00:00
Joey Hess
90dd245522
get --from is the same as copy --from
...
get not honoring --from has surprised me a few times, so least surprise
suggests it should just behave like copy --from. This leaves the difference
between get and copy being that copy always requires the remote to copy
from, while get will decide whether to get a file from a key/value store or
a remote.
2011-06-09 18:54:49 -04:00
Joey Hess
c38f826435
Data.Tuple.swap not available with ghc 6.12.3
2011-05-28 11:56:48 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
7db690bdc2
2011-05-28 12:26:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
f13863281c
2011-05-28 12:22:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
27847585cb
2011-05-28 12:18:07 +00:00
Joey Hess
5b941980aa
Closer emulation of git's behavior when told to use "foo/.git" as a git repository instead of just "foo". Closes : #627563
2011-05-22 14:12:16 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
786b990d51
Added a comment
2011-05-16 20:01:29 +00:00
Joey Hess
d006586cd0
add a message in potenatially confusing copy --fast failure situation
2011-05-16 13:27:19 -04:00
Joey Hess
d67998b3d3
meh
2011-05-15 20:40:03 -04:00
Joey Hess
c91764b257
move other comments
2011-05-15 20:35:39 -04:00
Joey Hess
af54d40d5b
move conversation to a real bug report
2011-05-15 20:33:39 -04:00
Joey Hess
89ee0c373b
Merge remote-tracking branch 'branchable/master'
2011-05-14 12:30:19 -04:00
http://joey.kitenet.net/
a43a273176
Added a comment
2011-05-14 16:29:35 +00:00
Joey Hess
bbab57ebe7
Merge remote-tracking branch 'branchable/master'
2011-05-14 12:29:10 -04:00
Joey Hess
020e9b013d
close
2011-05-14 12:28:45 -04:00
http://joey.kitenet.net/
fdc5e5f56c
Added a comment
2011-05-14 16:28:36 +00:00
Joey Hess
60a1aa418c
typo
2011-05-14 12:23:57 -04:00
Joey Hess
078a6fbd76
Work around a bug in Network.URI's handling of bracketed ipv6 addresses.
2011-05-06 15:21:30 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I
c7ff9d3dab
Add sign-off
2011-05-06 00:00:17 +00:00