lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pull: gracefully handle merge conflicts

Browse Source 
When a merge conflict occurs, it obviously isn't possible to check out
the file using git lfs checkout or git lfs pull, since it's unclear
which revision the user wants.  git lfs checkout handles this gracefully
by just ignoring the conflict, whereas git lfs pull causes a full logged
error, which is excessive.

Let's make git lfs pull match the behavior of git lfs checkout here by
having it ignore malformed pointer files just like it ignores files that
are not pointers.
This commit is contained in:
brian m. carlson 2020-10-22 20:56:31 +00:00
parent c6fc8813fd
commit 9e3bc45b93
No known key found for this signature in database
GPG Key ID: 2D0C9BC12F82B3A1
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commands/pull.go
View File

@ -67,7 +67,7 @@ func (c *singleCheckout) Run(p *lfs.WrappedPointer) {
// Check the content - either missing or still this pointer (not exist is ok)
filepointer, err := lfs.DecodePointerFromFile(cwdfilepath)
if err != nil && !os.IsNotExist(err) {
if errors.IsNotAPointerError(err) {
if errors.IsNotAPointerError(err) || errors.IsBadPointerKeyError(err) {
// File has non-pointer content, leave it alone
return
}

30
t/t-pull.sh
View File

@ -284,6 +284,36 @@ begin_test "pull with invalid insteadof"
)
end_test
begin_test "pull with merge conflict"
(
set -e
git init pull-merge-conflict
cd pull-merge-conflict
git lfs track "*.bin"
git add .
git commit -m 'gitattributes'
printf abc > abc.bin
git add .
git commit -m 'abc'
git checkout -b def
printf def > abc.bin
git add .
git commit -m 'def'
git checkout main
printf ghi > abc.bin
git add .
git commit -m 'ghi'
# This will exit nonzero because of the merge conflict.
GIT_LFS_SKIP_SMUDGE=1 git merge def || true
git lfs pull > pull.log 2>&1
[ ! -s pull.log ]
)
end_test
begin_test "pull: with missing object"
(
set -e