Problem with "git apply DressNPCs.diff"

Hello, well i have a problem with the DressNPCs.diff

But, i read the tutorial to make it works:

https://gist.github.com/Rochet2/2c7683c95d6f9c876980#file-dressnpcs-md

And i used this TC Version:

https://github.com/TrinityCore/TrinityCore/commit/e4c57d839d83a7e735d4b651827e2dca1ddc68cd

The DressNPCs.diff after the use of the Git Bash

Welcome to Git (version 1.8.3-preview20130601)

Run ‘git help git’ to display the help index.
Run ‘git help ’ to display help for specific commands.

Alejandro@ALEJANDRO-PC ~
$ cd desktop

Alejandro@ALEJANDRO-PC ~/desktop
$ cd trinitysource

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$ git apply DressNPCs.diff
DressNPCs.diff:9: trailing whitespace.
void ObjectMgr::LoadCreatureOutfits()
DressNPCs.diff:10: trailing whitespace.
{
DressNPCs.diff:11: trailing whitespace.
uint32 oldMSTime = getMSTime();
DressNPCs.diff:12: trailing whitespace.

DressNPCs.diff:13: trailing whitespace.
_creatureOutfitStore.clear(); // for reload case (
test only)
error: patch failed: src/server/game/Globals/ObjectMgr.cpp:7792
error: src/server/game/Globals/ObjectMgr.cpp: patch does not apply
error: patch failed: src/server/game/Globals/ObjectMgr.h:144
error: src/server/game/Globals/ObjectMgr.h: patch does not apply
error: patch failed: src/server/game/Handlers/SpellHandler.cpp:568
error: src/server/game/Handlers/SpellHandler.cpp: patch does not apply
error: patch failed: src/server/game/World/World.cpp:1444
error: src/server/game/World/World.cpp: patch does not apply
error: patch failed: src/server/scripts/Commands/cs_reload.cpp:85
error: src/server/scripts/Commands/cs_reload.cpp: patch does not apply

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$
I not know if the code finally was done, or what i need to do?

Gretttings!

Use the download gist button on the gist site.

Do not attempt to get the diff for example by copy pasting it or something.

That is probably the reason for the whitespace errors as well as the other errors.

Well i tried to make it works like you comentary

[CODE]
Welcome to Git (version 1.8.3-preview20130601)

Run ‘git help git’ to display the help index.
Run ‘git help ’ to display help for specific commands.

Alejandro@ALEJANDRO-PC ~
$ cd descargas
sh.exe": cd: descargas: No such file or directory

Alejandro@ALEJANDRO-PC ~
$ cd descargas
sh.exe": cd: descargas: No such file or directory

Alejandro@ALEJANDRO-PC ~
$ cd

Alejandro@ALEJANDRO-PC ~
$ cd Descargas
sh.exe": cd: Descargas: No such file or directory

Alejandro@ALEJANDRO-PC ~
$ cd downloads

Alejandro@ALEJANDRO-PC ~/downloads
$ cd gist2c7683c95d6f9c876980-ea95b412b8ab8bccf9b1aa2df6c11f12db7a293a

Alejandro@ALEJANDRO-PC ~/downloads/gist2c7683c95d6f9c876980-ea95b412b8ab8bccf9b1
aa2df6c11f12db7a293a
$ git apply DressNPCs.diff
error: src/server/game/Globals/ObjectMgr.cpp: No such file or directory
error: src/server/game/Globals/ObjectMgr.h: No such file or directory
error: src/server/game/Handlers/SpellHandler.cpp: No such file or directory
error: src/server/game/World/World.cpp: No such file or directory
error: src/server/scripts/Commands/cs_reload.cpp: No such file or directory

Alejandro@ALEJANDRO-PC ~/downloads/gist2c7683c95d6f9c876980-ea95b412b8ab8bccf9b1
aa2df6c11f12db7a293a
$[/CODE]

Hello, i need your help, will the files:

error: src/server/game/Globals/ObjectMgr.cpp: No such file or directory

error: src/server/game/Globals/ObjectMgr.h: No such file or directory

error: src/server/game/Handlers/SpellHandler.cpp: No such file or directory

error: src/server/game/World/World.cpp: No such file or directory

error: src/server/scripts/Commands/cs_reload.cpp: No such file or directory

Are not detected by the “Git Bash”, the files exist, i not understand why not are detected by the program and not patch the core?

In a recient compilation, i have a succesfull result with my own Botcore Repack, made with, NPCBots.patch and i can make summon the mods bots.

Here is a example of the succesfull patching:

Welcome to Git (version 1.8.3-preview20130601)

Run ‘git help git’ to display the help index.
Run ‘git help ’ to display help for specific commands.

Alejandro@ALEJANDRO-PC ~
$ cd desktop

Alejandro@ALEJANDRO-PC ~/desktop
$ cd trinitysource

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$ patch -p1 < NPCBots.patch
patching file sql/Bots/auth_rbac.sql' patching file sql/Bots/character_NPC_bots.sql’
patching file sql/Bots/world_bot_helper_locales_gossip_menu_option.sql' patching file sql/Bots/world_bots.sql’
patching file sql/Bots/world_creature_template_outfits.sql' patching file src/server/game/AI/NpcBots/QBots/botQ_Airen.cpp’
patching file src/server/game/AI/NpcBots/bot_GridNotifiers.h' patching file src/server/game/AI/NpcBots/bot_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_ai.h' patching file src/server/game/AI/NpcBots/bot_death_knight_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_druid_ai.cpp' patching file src/server/game/AI/NpcBots/bot_hunter_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_mage_ai.cpp' patching file src/server/game/AI/NpcBots/bot_paladin_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_priest_ai.cpp' patching file src/server/game/AI/NpcBots/bot_rogue_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_shaman_ai.cpp' patching file src/server/game/AI/NpcBots/bot_warlock_ai.cpp’
patching file src/server/game/AI/NpcBots/bot_warrior_ai.cpp' patching file src/server/game/AI/NpcBots/botcommands.cpp’
patching file src/server/game/AI/NpcBots/bothelper.cpp' patching file src/server/game/AI/NpcBots/bothelper.h’
patching file src/server/game/Accounts/RBAC.h' Hunk #1 succeeded at 683 with fuzz 1 (offset 3 lines). patching file src/server/game/CMakeLists.txt’
patching file src/server/game/Entities/Creature/Creature.cpp' patching file src/server/game/Entities/Creature/Creature.h’
patching file src/server/game/Entities/Creature/TemporarySummon.cpp' patching file src/server/game/Entities/Object/Object.cpp’
Hunk #1 succeeded at 2191 (offset 11 lines).
patching file src/server/game/Entities/Player/Player.cpp' Hunk #3 succeeded at 897 (offset -1 lines). Hunk #5 succeeded at 1902 (offset -2 lines). Hunk #7 succeeded at 2531 (offset -2 lines). Hunk #9 succeeded at 3909 (offset -18 lines). Hunk #10 succeeded at 6011 (offset 12 lines). patching file src/server/game/Entities/Player/Player.h’
Hunk #2 succeeded at 2304 (offset 4 lines).
patching file src/server/game/Entities/Totem/Totem.cpp' patching file src/server/game/Entities/Unit/StatSystem.cpp’
patching file src/server/game/Entities/Unit/Unit.cpp' Hunk #1 succeeded at 345 (offset 2 lines). Hunk #3 succeeded at 1013 (offset 2 lines). Hunk #5 succeeded at 1196 (offset 2 lines). Hunk #6 succeeded at 10451 (offset -10 lines). Hunk #7 succeeded at 13167 (offset 4 lines). Hunk #8 succeeded at 16589 (offset -13 lines). patching file src/server/game/Globals/ObjectMgr.cpp’
Hunk #1 succeeded at 7792 (offset 7 lines).
patching file src/server/game/Globals/ObjectMgr.h' patching file src/server/game/Groups/Group.cpp’
Hunk #1 succeeded at 107 (offset 1 line).
Hunk #3 succeeded at 382 (offset 1 line).
Hunk #5 succeeded at 485 (offset 1 line).
patching file src/server/game/Groups/Group.h' patching file src/server/game/Handlers/CharacterHandler.cpp’
Hunk #2 succeeded at 1033 with fuzz 2 (offset 3 lines).
patching file src/server/game/Handlers/MiscHandler.cpp' Hunk #2 succeeded at 124 (offset 10 lines). Hunk #4 succeeded at 197 (offset 11 lines). patching file src/server/game/Handlers/NPCHandler.cpp’
Hunk #2 succeeded at 305 (offset 7 lines).
patching file src/server/game/Handlers/SpellHandler.cpp' Hunk #1 succeeded at 568 (offset 2 lines). patching file src/server/game/Maps/Map.cpp’
Hunk #1 succeeded at 2679 (offset 165 lines).
patching file src/server/game/Scripting/ScriptLoader.cpp' Hunk #1 succeeded at 1436 (offset 2 lines). patching file src/server/game/Server/WorldSession.cpp’
patching file src/server/game/Server/WorldSession.h' patching file src/server/game/World/World.cpp’
Hunk #1 succeeded at 1444 (offset 1 line).
patching file src/server/scripts/Spells/spell_priest.cpp' Hunk #1 succeeded at 561 (offset 148 lines). Hunk #3 succeeded at 747 (offset 148 lines). patching file src/server/shared/Database/Implementation/CharacterDatabase.cpp’
patching file src/server/shared/Database/Implementation/CharacterDatabase.h' Hunk #1 succeeded at 534 (offset 2 lines). patching file src/server/shared/Database/Implementation/WorldDatabase.cpp’
patching file src/server/shared/Database/Implementation/WorldDatabase.h' patching file src/server/worldserver/worldserver.conf.dist’
Hunk #1 succeeded at 2843 (offset 26 lines).

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$
I really need your help, grettings!

You were in wrong folder with git.

You were in: [COLOR=rgb(0,136,0)]Alejandro@ALEJANDRO-PC ~/downloads/gist2c7683c95d6f9c876980-ea95b412b8ab8bccf9b1[COLOR=rgb(0,136,0)]aa2df6c11f12db7a293a

You were supposed to be in: [COLOR=rgb(0,136,0)]Alejandro@ALEJANDRO-PC ~/desktop/trinitysource

Actually in my first message i do it:

Welcome to Git (version 1.8.3-preview20130601)

Run ‘git help git’ to display the help index.
Run ‘git help ’ to display help for specific commands.

Alejandro@ALEJANDRO-PC ~
$ cd desktop

Alejandro@ALEJANDRO-PC ~/desktop
$ cd trinitysource

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$ git apply DressNPCs.diff
DressNPCs.diff:9: trailing whitespace.
void ObjectMgr::LoadCreatureOutfits()
DressNPCs.diff:10: trailing whitespace.
{
DressNPCs.diff:11: trailing whitespace.
uint32 oldMSTime = getMSTime();
DressNPCs.diff:12: trailing whitespace.

DressNPCs.diff:13: trailing whitespace.
_creatureOutfitStore.clear(); // for reload case (
test only)
error: patch failed: src/server/game/Globals/ObjectMgr.cpp:7792
error: src/server/game/Globals/ObjectMgr.cpp: patch does not apply
error: patch failed: src/server/game/Globals/ObjectMgr.h:144
error: src/server/game/Globals/ObjectMgr.h: patch does not apply
error: patch failed: src/server/game/Handlers/SpellHandler.cpp:568
error: src/server/game/Handlers/SpellHandler.cpp: patch does not apply
error: patch failed: src/server/game/World/World.cpp:1444
error: src/server/game/World/World.cpp: patch does not apply
error: patch failed: src/server/scripts/Commands/cs_reload.cpp:85
error: src/server/scripts/Commands/cs_reload.cpp: patch does not apply

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$
The Git insist in not patch the trinitysource folder, please tell me why supose to do in this chase:

The: git apply DressNPCs.diff

Not works, and not patch any file.

there are another commands to make it patch,

Hello i was make the new test and this is the result:

Welcome to Git (version 1.8.3-preview20130601)

Run ‘git help git’ to display the help index.
Run ‘git help ’ to display help for specific commands.

Alejandro@ALEJANDRO-PC ~
$ cd desktop

Alejandro@ALEJANDRO-PC ~/desktop
$ cd trinitysource

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$ git apply DressNPCs.diff
DressNPCs.diff:9: trailing whitespace.
void ObjectMgr::LoadCreatureOutfits()
DressNPCs.diff:10: trailing whitespace.
{
DressNPCs.diff:11: trailing whitespace.
uint32 oldMSTime = getMSTime();
DressNPCs.diff:12: trailing whitespace.

DressNPCs.diff:13: trailing whitespace.
_creatureOutfitStore.clear(); // for reload case (
test only)
error: patch failed: src/server/game/Globals/ObjectMgr.cpp:7792
error: src/server/game/Globals/ObjectMgr.cpp: patch does not apply
error: patch failed: src/server/game/Globals/ObjectMgr.h:144
error: src/server/game/Globals/ObjectMgr.h: patch does not apply
error: patch failed: src/server/game/Handlers/SpellHandler.cpp:568
error: src/server/game/Handlers/SpellHandler.cpp: patch does not apply
error: patch failed: src/server/game/World/World.cpp:1444
error: src/server/game/World/World.cpp: patch does not apply
error: patch failed: src/server/scripts/Commands/cs_reload.cpp:85
error: src/server/scripts/Commands/cs_reload.cpp: patch does not apply

Alejandro@ALEJANDRO-PC ~/desktop/trinitysource
$

I dont khow if is ready patched, the file insist in the error files.

[ATTACH]1092._xfImport[/ATTACH]