Fix #732: Add LFS objects to base repository on merging (#7082)

Browse Source

On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)

...

This commit is contained in:

zeripath

2019-06-22 18:35:34 +01:00

committed by GitHub

parent d14595514e

commit baefea311f

7 changed files with 648 additions and 292 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

288

models/pull.go

File diff suppressed because it is too large Load Diff