srombauts / uegitplugin Goto Github PK

Is it possible to have instructions using gitlab.com git-lfs and git-annex?

Hello, my team and I tried to use the Git plugin with no prevail. Is the required process to have github for windows open at the same time Unreal Engine 4 is open, and inside unreal engine 4, when a file has been added, then go to the git for windows UI and sync it to the master branch? or should you not have to even touch git for windows?

Your advice would be greatly appreciated.

Thanks,

The plugin does not currently work with EU 4.6

Hello,

Currently when there is a merge conflict between 2 blueprint files and if I select "Merge" under source control option engine crashes. Is this something your aware of?

Thanks :)

Hi,

I postet this post in Unreal Answer Hub a while ago. Unfortunately there was no response.
Can you helpt me with this:

When I switch the branch of my repo (in my git console), the Unreal editor does not give me the option to check out changed files. The files change on disk, but the editor does not seem "to notice" that they were changed.

Do I have to restart the editor whenever a file (e.g. a blueprint) is changed on the file system (either by pulling from a remote or switching to a branch, which holds changes)? Or ist there any other way to force the editor to check out the changed version - the context menu on the respective asset does not give me this choice either!

To revert an asset modified (made writable for save but not checked-out) you need to checkout it first.

When multiple directory are selected in the content browser, their status become "unchanged".

This can come from a limit somewhere (command line size, number of files...)

After a Move/Rename operation, the old asset file is replaced by a "redirector" file of the same name, pointing to the new asset file.

A problem arises if this redirector is not committed immediately with the new asset:

• the old asset is still in source control
• the redirector is not in source control
• the new asset is also in source control
  there are two identical files checked in the source control system. Thus the operation appears as a copy/duplicate, instead of a rename.

This happens when the new file is directly selected for check-in: only the new file is proposed for check-in (not the redirector itself).

=> Users must select a whole directory or game project to commit all files with an atomic multi-file check-in.

I have been getting crashes on closing UE4.4 if this Git plugin is enabled and source control is activated. This did not happen in 4.2 or 4.3. I have the most recent version of this plugin.

[2014.08.17-14.48.11:654][234]LogModuleManager: Shutting down and abandoning module GitSourceControl (67)
[2014.08.17-14.48.11:655][234]LogModuleManager: Shutting down and abandoning module SubversionSourceControl (66)
[2014.08.17-14.48.11:655][234]LogModuleManager: Shutting down and abandoning module SourceControl (65)
First-chance exception at 0x00007FFC913E018B (UE4Editor-SourceControl.dll) in UE4Editor.exe: 0xC0000005: Access violation reading location 0xFFFFFFFFFFFFFFFF.
Unhandled exception at 0x00007FFC913E018B (UE4Editor-SourceControl.dll) in UE4Editor.exe: 0xC0000005: Access violation reading location 0xFFFFFFFFFFFFFFFF.

Support for multi-line descriptions was added back on Unreal Engine 4.4x if I recall correctly.

What cannot be done presently:

• commit description message cannot take more than one line (Editor limitation)

Directly after the "rename" operation, the editor shows an "Added" file, and "Submit to source control" window shows 2 "Added" files

Git status returns the following, showing the redirector and the renamed asset

git status --porcelain --ignored
M  Content/UE4GitPluginDev/Named.uasset
C  Content/UE4GitPluginDev/Named.uasset -> Content/UE4GitPluginDev/ReNamed.uasset
 M Plugins/UE4GitPlugin

At this stage, Copied status could be interpreted as renamed/moved or keep this explicit status.

After "Fix Up Redirectors in Folder" we obtain the following:

R  Content/UE4GitPluginDev/Named.uasset -> Content/UE4GitPluginDev/ReNamed.uasset

But still, the icons only show Added and Removed items

When u try to check in more than 1 asset, only the first one unlocks. Others remain "check outed", and u need revert, to get reed of it.

My Problem:
I have Development and Featurebranch(remote and locally) and i am using git-lfs.
I made changes to my featurebranch and using normal Rebaseworkflow, i want to rebase it on my local copy of development. However this has the following problems:

1)The UI in editor does not support anything besides pulling/pushing from/to the remote
2)I need to use my GitExtensions to start the rebase, which works but
2a) Lots of "can not unlink old file xy" (since my editor is open)
2b) any conflict which occurs is not detected in the Mergetool(i can't click Prev/Next Conflict)
3)if i keep the editor closed while rebasing and conflicts occur, openng the ditor will not show assets being part of the conflict so opening the Mergetool is not possible(i know, this is not your problem but that's what i struggle with)

Using UE4.15, Submit Source Control leads to:

LogSavePackage:Display: Finished SavePackage ../../../../../../Users/sebas/workspace/MyProject/Content/MyProject/Named.uasset
SourceControl: Info fatal: C:/Program Files/Epic Games/4.15/Engine/Content/: 'C:/Program Files/Epic Games/4.15/Engine/Content/' is outside repository
LogPackageName:Error: Illegal call to DoesPackageExist: '../../../../../../Users/sebas/workspace/MyProject/MyProject.uproject' is not a standard unreal filename or a long path name. Reason: Path should be no less than 4 characters long.
LogStats: FPlatformStackWalk::StackWalkAndDump -  0.409 s
LogOutputDevice:Error: === Handled ensure: ===
LogOutputDevice:Error: Ensure condition failed: false [File:D:\Build\++UE4+Release-4.15+Compile\Sync\Engine\Source\Runtime\CoreUObject\Private\Misc\PackageName.cpp] [Line: 650]
LogOutputDevice:Error: Illegal call to DoesPackageExist: '../../../../../../Users/sebas/workspace/MyProject/MyProject.uproject' is not a standard unreal filename or a long path name. Reason: Path should be no less than 4 characters long.
LogOutputDevice:Error: Stack: 
LogOutputDevice:Error: UE4Editor-Core.dll!0x00000000876595E6
LogOutputDevice:Error: UE4Editor-Core.dll!0x0000000087409B82
LogOutputDevice:Error: UE4Editor-Core.dll!0x000000008741B666
LogOutputDevice:Error: UE4Editor-CoreUObject.dll!0x000000008C36A6E8
LogOutputDevice:Error: UE4Editor-SourceControl.dll!0x0000000081AB3D22
LogOutputDevice:Error: UE4Editor-SourceControl.dll!0x0000000081AB3EB9
LogOutputDevice:Error: UE4Editor-SourceControlWindows.dll!0x000000006C5F1D2E
LogOutputDevice:Error: UE4Editor-SourceControlWindows.dll!0x000000006C5AB4B5
LogOutputDevice:Error: UE4Editor-SourceControlWindows.dll!0x000000006C5AAA8D
LogOutputDevice:Error: UE4Editor-SourceControlWindows.dll!0x000000006C5BF274
LogOutputDevice:Error: UE4Editor-GitSourceControl.dll!0x0000000062A7B851
LogOutputDevice:Error: UE4Editor-GitSourceControl.dll!0x0000000062A8D1ED
LogOutputDevice:Error: UE4Editor-SourceControl.dll!0x0000000081AB9C5C
LogOutputDevice:Error: UE4Editor-UnrealEd.dll!0x000000007B857517
LogOutputDevice:Error: UE4Editor-UnrealEd.dll!0x000000007C062196
LogOutputDevice:Error: UE4Editor.exe!0x000000001C67DEE3
LogOutputDevice:Error: UE4Editor.exe!0x000000001C66EB40
LogOutputDevice:Error: UE4Editor.exe!0x000000001C66EBBA
LogOutputDevice:Error: UE4Editor.exe!0x000000001C680A29
LogOutputDevice:Error: UE4Editor.exe!0x000000001C6822B6
LogOutputDevice:Error: KERNEL32.DLL!0x00000000BE9E2774
LogOutputDevice:Error: ntdll.dll!0x00000000C0680D61
LogStats:                SubmitErrorReport -  0.000 s
LogStats:                    SendNewReport -  0.566 s
LogStats:             FDebug::EnsureFailed -  0.986 s
LogSourceControl: FGitCheckInWorker: commit successful
SourceControl: Info [master 6d60c6f] global checkin
SourceControl: Info  1 file changed, 0 insertions(+), 0 deletions(-)
SourceControl: Info Commited [master 6d60c6f] global checkin.

In fact, just leaving the Submit files window, that is, not even committing, leads to this

Unreal Engine can't read uasset file if it is in a conflict state after merging branches. Because of GIT LFS there is not binary content of the uasset files and resolving of the conflict is not possible.

To help analyze bugs related to the usage of the plugin, I should print the path to git.exe

I clone as submodule your master but it don't work. Editor write "plugin's compatibility error" (verb.) and shuttin down. On 4.15 it worked well.

I need to describe server requirements, .gitattributes configuration, and the workflow.

I've started work on the Git Plugin to add explicite Git LFS support with the new "lock" mechanism.

I am developing this in a branch on my fork of the UnrealEngine repository (git-plugin-add-git-lfs-lock-support branch)
Now available in this repository add-git-lfs2-file-lock-support (release "2.3-lfs2-lock-preview")

Deleting an asset uses the "git rm" command that does not work with a relative path.
This result on a file not deleted!

Broken since 4.16

Scenario: remove, delete and rename assets outside the Editor, relaunch the Editor and Submit to Source Control

UpdateStatus() refactor is not enough, we need to check explicitly for missing files

When i changed .umap asset and checked it in, my team partner wont be able to see “!” mark on asset after refreshing it. Is that function not exists, or its just a bug? And i also like to know if it possible to force refresh file on every computer automatically after i checked it out?

Hi! I'm having a problem when I commit into my project, complaining about the files that are used but are external to the repository and live in the engine instead. This is what the Message Log shows when I try to commit:

I understand what's causing this is the fact that only the project files were set to be part of the git repository and not the ones inside the engine. But what's the idea to solve this? I thought that the plugin would take care of that. I'm using UE 4.13.2. Thank you.

The v2.0 plugin I released recently for UE4.15.2 is giving me an error when I try to commit a BP asset (managed by Git LFS, but this has probably nothing to do with it)

Hello.

I recently migrated from Bitbucket to GitHub repo. I use LFS for uasset. Source control plugin version 2.1. My Project has submodule in Content directory.

Testcase:

1. Select asset->SourceControl->History
2. Click on any commit->Diff against previous revision

Message "Unable to load assets to diff. Content may no longer be supported?".
Sometimes editor may freeze and don't respond (without Message).

Sorry for my english. English is not my native language(

I started using the plugin on a small project, but I seem to unable make a diff working. I am using LFS for all *.uasset and *.umap files since start of the project, but that should be working as per readme, right?

I am on Windows 10 x64.
git version 2.10.1.windows.1
git-lfs/1.5.2 (GitHub; windows amd64; go 1.7.3; git 547a06aa)

Presently, the message shown to the user after a successful commit operation is "unreadable" ; it is the last line of the command line result message.

Is there a predefined list of GIT-LFS files for UE4 projects that are binaries?

Stuff like:

• .uasset
• .mp4
• ETC

Maybe if the file is bigger than 300 KB it'll prompt to add it to LFS.

Please look into support for git annex.

Implement FGitSourceControlProvider::bWorkingOffline to detect disconnection like the SubversionSourceControl plugin

Renaming a locked asset and checkin it try to unlock the new name of the asset, which is not unlocking the old path (not used anymore).

False error in logs after a successful push to a LFS 2 server with File Locks:

 To https://github.com/SRombauts/UE4GitLfs2FileLocks.git
    ee44ff5..59da15e HEAD -> master

Git commands run on more than 20 files are cut into batches of 20 files to avoid hitting command line size limit.

But this does not work in alpha 0.3, only the first 20 first files are processed correctly.

Give the possibility to use the same push command as Git LFS 2 when not using File Locking.

First report of this issue in Mars 2017:

First of all, thanks for providing the Unreal Engine 4 git plug in. I'm a mac user and I have installed git and git lfs successfully in my computer. I have already created a new repository and I'm using Unreal and git to work with another partner. Everything that is not LFS can be checked-in form Unreal without issues. However, everything LFS can't be checked-in, and every time I try to check-in any LFS file from Unreal I get the following errors:

Error git-lfs filter-process: git-lfs: command not found
Error fatal: The remote end hung up unexpectedly.

Do you know if there is a workaround to this issue? Maybe I'm still missing an additional step when installing git.

As additional information, I can manually sync LFS files directly from Github, but as mentioned before, not from Unreal.

Seeing as how one can't do PRs on releases(to the best of my knowledge), could you create a 4.6 release?

Hello SRombauts,

Thanks to the report of a user, we came across an issue where saving an asset that is currently checked in will cause it to be checked out immediately without any confirmation. This isn't exactly a bug but causes issues with workflow so you can see this as more of a feature request. The favorable behavior would mimic the Perforce plugin where it asks if you would like to check out the asset, make it writable, or cancel the process. I put a bug report in for the issue and made it public so you can track it here

You can see a picture of what the Perforce behavior looks like on the Answerhub post that is linked to that bug report.

Thank you for your time!

This would be a handy feature :)

You can find more info on how Atlassian has setup SourceTree with these features here: http://blog.sourcetreeapp.com/2012/02/06/jira-integration-other-external-project-links/

Furthermore,
Being able to update the status of an issue / ticket in editor would be much more of an undertaking, yet would be a luxuries feature indeed ;)

p.s. excellent work on the plugin so far.

Cheers,
Benjamin D. Smith

https://issues.unrealengine.com/issue/UE-44637
https://answers.unrealengine.com/questions/583992/can-not-delete-asset-that-is-marked-for-add-with-g.html

Deleting an asset that is marked for add when using the Git source control plugin no longer actually deletes the asset. Instead the file will be removed from the Content Browser (it actually stays in the Content Browser after the delete process completes in 4.17), but the corresponding .uasset file remains in the project's Content folder on the disk, and when the project is opened again, those files will once again be seen in the Content Browser and will still be marked for add.

REGRESSION:
Yes. In 4.13, deleting an asset marked for add when using the Git source control plugin deleted the associated .uasset file from the project's Content folder as well, and the asset would not reappear in the Content Browser the next time the project is opened.

Since 4.3 source control can resolve conflict but this capability has not been added to the Git Plugin

Answerhub Git LFS Conflict Resolution

Does the git plugin works for conflicts on Blueprints tracked by Git LFS?

From answerhub Git Merge - Accept Target - causes engine to crash

When I am pulling changes from the server with changes in the file after I edited it locally I am getting a conflict as expected.

As I am trying to resolve the conflict using the Merge Tool, and using the "Accept Target" button, the engine crashes.

Is git-annex actually supported on Windows? I've tried setting it up via annex.largefiles settings and this works when using git annex add ... from the commandline, but adding/committing via the editor's menu seems to bypass this and still commits directly to git (surprisingly since git-annex normally disables git-add etc for direct mode).

Since 4.3 source control copies now integrate/copy instead of Delete + Add but this capability has not been added to the Git Plugin

Commit message is passed through a temporary file in UTF8 that begins with a BOM signature.

In 4.5 and 4.6, when I click 'Accept Settings', it gives me an error in the source control log. From what I remember, it is calling the git status command.

This is the error:

Error fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.
Error Use '--' to separate paths from revisions, like this:
Error 'git <command> [<revision>...] -- [<file>...]'
Info HEAD

I dont know how to reproduce this bug, but my friend tried to check out the file of my project and got error message. When he close it a blue sign appears wich say that he - “his git account name wich is not the same like in plugin setup” locked asset. So he cant edit that asset. The only way to unlock it was github desktop powershell command. We tried lot of things like reinstalling plugin, deleting save folder of project, but nothing could help.

I followed the setup guide, I use the github visual client. When I launch unreal I get the following messages:

git-fat appears to be a good alternative or even stepping stone to #1 (git-annex & git-media),

As there are less dependencies & there appears to be a more transparent workflow provided with the git-fat solution 👍

git-fat Github Public Repo | https://github.com/jedbrown/git-fat

Poor performances of 'lfs locks' on Windows command line (vs Windows Subsystem for Linux) #2616

I am seeing very poor performances of the "git lfs locks" command:

• it takes +3 seconds, sometimes +5s on the Windows command line (as well as on the Windows Git Bash command line.
• by comparison, under the Windows Subsystem for Linux "Bash Ubuntu" (or under Linux) it takes repeatedly around 1s