Commit graph

7246 commits

Author SHA1 Message Date
Joey Hess
c8edd22aee
update 2016-09-21 17:56:40 -04:00
Joey Hess
ef681321a9
comment 2016-09-21 17:53:59 -04:00
Joey Hess
c910004d50
addurl, importfeed: Improve behavior when file being added is gitignored. 2016-09-21 17:21:48 -04:00
Joey Hess
3b2222d753
update 2016-09-21 15:53:34 -04:00
Joey Hess
181d027ace
merge 2016-09-21 15:47:37 -04:00
Joey Hess
a569f195b7
fix bugs in handing of deep branches with sync and adjusted branches
* sync: Previously, when run in a branch with a slash in its name,
  such as "foo/bar", the sync branch was "synced/bar". That conflicted
  with the sync branch used for branch "bar", so has been changed to
  "synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
  such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
  That conflicted with the adjusted branch used for branch "bar",
  so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
  changes back to the parent branch when it had a slash in its name.
  This bug has been fixed.

Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.

Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.

In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.

This commit was sponsored by Riku Voipio.
2016-09-21 15:23:47 -04:00
Joey Hess
8dae86eac2
bug 2016-09-21 14:57:20 -04:00
Joey Hess
f6fc40456d
comment, retitle 2016-09-21 13:42:42 -04:00
Joey Hess
ce03779e8c
comment and close 2016-09-21 13:32:45 -04:00
Joey Hess
c2218b78c3
close 2016-09-21 13:06:34 -04:00
Joey Hess
1702505f60
comment 2016-09-21 13:06:12 -04:00
PaulK
13ed6c83bb Added a comment 2016-09-19 04:39:08 +00:00
git-starter
2f4901f576 2016-09-16 14:40:49 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
7c5ff428a8 I got the files to come back, but I don't want Android making these dumb delete-loads-of-newly-added-stuff commits 2016-09-16 03:03:19 +00:00
interfect@b151490178830f44348aa57b77ad58c7d18e8fe7
d62ee47ab3 2016-09-16 01:56:57 +00:00
Joey Hess
ddc1b46fc2
comment 2016-09-14 12:28:18 -04:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
a1809b2827 Added a comment 2016-09-13 07:05:48 +00:00
jk@3f2b4ce16bbac41470815333505aa47b91b7a9a6
848d160077 Added a comment 2016-09-12 19:57:03 +00:00
atrent
201a99f510 2016-09-10 07:23:07 +00:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
1f1b7adecf initial whining 2016-09-09 18:45:02 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
16b2604a20 Added a comment 2016-09-09 06:51:45 +00:00
Joey Hess
ae658ddcdc
close; notabug 2016-09-07 11:07:42 -04:00
Joey Hess
d18bc92251
remove cruft 2016-09-07 11:07:25 -04:00
onionjake
9aacde3f65 Added a comment 2016-09-06 19:45:06 +00:00
onionjake
a885d23bad you can create bugs with empty titles 2016-09-06 19:44:11 +00:00
leni536
9065e994b4 2016-09-06 09:34:14 +00:00
Joey Hess
1b8d8faa3a
applied 2016-09-05 19:43:59 -04:00
Joey Hess
2610103a48
comment 2016-09-05 16:00:51 -04:00
Joey Hess
a64b33fe3b
close 2016-09-05 15:50:05 -04:00
Joey Hess
219e2fa157
Make --json and --quiet suppress automatic init messages
And any other messages that might be output before a command starts.

Fixes a reversion introduced in version 5.20150727.

During the optparse-applicative conversion, I needed a place to run
per-command global option setters, and I made it get run during the seek stage. But
that is too late to have --json and --quiet disable output produced in the
check stage. Fix is just to run those per-command global option setters at
the same time as the all-command global option setters.

This commit was sponsored by Thom May.
2016-09-05 15:34:38 -04:00
Joey Hess
0ef3bfa6b0
moreinfo; probably not a bug 2016-09-05 14:22:59 -04:00
Joey Hess
40c0a91641
comment 2016-09-05 13:57:26 -04:00
Joey Hess
d75aac5003
comment 2016-09-05 13:12:56 -04:00
Joey Hess
cfa31c6bf8
close as dup 2016-09-05 13:11:05 -04:00
Joey Hess
778948eb24
comment 2016-09-05 12:33:22 -04:00
Joey Hess
1a085ca4dd
fix name 2016-09-05 11:29:46 -04:00
onionjake
65788cc8c0 fsck --from <remote> doesn't update inventory on failure 2016-09-04 21:00:57 +00:00
corppneq
7c9ff2b4e4 2016-09-03 11:01:23 +00:00
plb@5a17d4ca1791c7e2e176e22c7fb64a5b77f1679c
c854d09d3c 2016-09-03 08:42:45 +00:00
plb@5a17d4ca1791c7e2e176e22c7fb64a5b77f1679c
3463b441a1 2016-09-03 08:42:05 +00:00
plb@5a17d4ca1791c7e2e176e22c7fb64a5b77f1679c
4fe92819d2 2016-09-03 08:41:44 +00:00
Joey Hess
803c4c07e1
Merge branch 'master' of ssh://git-annex.branchable.com 2016-08-30 16:10:12 -04:00
Joey Hess
442e2d50bd
bug report from tribut on irc 2016-08-30 16:09:28 -04:00
matthias.may@b2b2d601f3c2e35dbb95ada1d3a715e2960f36e7
7f453d6ef9 2016-08-30 05:12:43 +00:00
adamboche@d77483462c747486c7a7341a9080d1341eeddfe6
fb3eda62c0 Added a comment: Retry rsync on failure 2016-08-26 23:32:46 +00:00
adamboche@d77483462c747486c7a7341a9080d1341eeddfe6
e95f16cd85 2016-08-26 23:03:49 +00:00
adamboche@d77483462c747486c7a7341a9080d1341eeddfe6
fb4a3b185e 2016-08-26 23:02:23 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
15d344192d Added a comment 2016-08-24 10:53:05 +00:00
https://openid.stackexchange.com/user/3ee5cf54-f022-4a71-8666-3c2b5ee231dd
f852573de8 create bug 2016-08-24 10:39:51 +00:00
t.z.mates
3177eab044 2016-08-23 23:01:47 +00:00