From 7a6fb7d263e64434615bd592da749adceb82cf01 Mon Sep 17 00:00:00 2001 From: Marat Radchenko Date: Wed, 15 May 2019 18:49:12 +0300 Subject: [PATCH] Replace headers instead of appending duplicates in order to match git-lfs behavior See https://github.com/go-gitea/gitea/pull/6958 While I believe this is supposed to be fixed on Gitea side, we can make changes in order to become compatible with older Gitea releases. --- README.md | 2 ++ gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index efd44f9..109d0f9 100644 --- a/README.md +++ b/README.md @@ -56,6 +56,8 @@ See https://github.com/bozaro/git-lfs-java/blob/master/gitlfs-server/src/test/ja Version 0.13.0 (Unreleased) + * Fix compatibility with Gitea LFS + Version 0.12.0 * Update dependencies diff --git a/gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java b/gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java index afbd232..459ecb3 100644 --- a/gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java +++ b/gitlfs-client/src/main/java/ru/bozaro/gitlfs/client/Client.java @@ -322,7 +322,7 @@ public R doRequest(@Nullable Link link, @NotNull Request task, @NotNull U protected void addHeaders(@NotNull HttpUriRequest req, @Nullable Link link) { if (link != null) { for (Map.Entry entry : link.getHeader().entrySet()) { - req.addHeader(entry.getKey(), entry.getValue()); + req.setHeader(entry.getKey(), entry.getValue()); } } }