summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Simon Legner <Simon.Legner@gmail.com>2020-09-21 12:39:55 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-21 12:37:38 -0700
commit96653ce3041e87f71a8dbbcfd4cb80424758c8fd (patch)
tree63d706642e39fd80ed043c28bbb1ce364a6cc5b2 /builtin/merge-recursive.c
parentremote-mediawiki tests: use CLI installer (diff)
downloadtgif-96653ce3041e87f71a8dbbcfd4cb80424758c8fd.tar.xz
remote-mediawiki: fix duplicate revisions being imported
Fix a bug with revisions being imported twice. This commit is being backported from Git-Mediawiki.git's e41ee9b ("All revisions imported twice", 2018-02-02) to git.git. See [1] for the original commit and [2] and [3] for the upstream PR and issue. 1. https://github.com/Git-Mediawiki/Git-Mediawiki/commit/e41ee9b3a32416df381cdc79f63350665c84151e 2. https://github.com/Git-Mediawiki/Git-Mediawiki/pull/61 3. https://github.com/Git-Mediawiki/Git-Mediawiki/issues/29 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions