summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-19 12:01:00 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-19 12:01:00 -0400
commitd909466b8ab867ed4cf688c7a0deb4c4e898c08c (patch)
tree6d30480ac3ff0a355d40012516b28f27c00caf4d
parent12b375f583773fc33f9f379d13622cd1892860a4 (diff)
addurl --json: Include field for added key
(unless the file was added directly to git due to annex.largefiles configuration.) (Also done by add --json and import --json)
-rw-r--r--Command/AddUrl.hs1
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 0 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index d6a4c6143..7d7796ba5 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -379,6 +379,7 @@ cleanup u url file key mtmp = case mtmp of
)
where
go = do
+ maybeShowJSON [("key", key2file key)]
when (isJust mtmp) $
logStatus key InfoPresent
setUrlPresent u key url
diff --git a/debian/changelog b/debian/changelog
index 47b51ac38..07834662f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ git-annex (6.20160115) UNRELEASED; urgency=medium
terminal. This is particuarly important for commands with --batch
output, which was not always being flushed at an appropriate time.
* add, import: Support --json output.
+ * addurl --json: Include field for added key (unless the file was
+ added directly to git due to annex.largefiles configuration.)
+ (Also done by add --json and import --json)
-- Joey Hess <id@joeyh.name> Fri, 15 Jan 2016 14:05:01 -0400