You may just rm -rf sqlmap and reclone. :-\
On Jul 13, 2012 11:32 AM, "Iago Sousa" <[email protected]> wrote:
> Git shows the same error.
>
> On Fri, Jul 13, 2012 at 3:24 PM, Brandon Perry
> <[email protected]>wrote:
>
>> Now run git pull
>> On Jul 13, 2012 11:23 AM, "Iago Sousa" <[email protected]> wrote:
>>
>>> I think my git is crazy.
>>>
>>> root@bt:/pentest/database/sqlmap# git reset --hard HEAD
>>> HEAD is now at 25eca9d finally got this working on MSSQL 2005: commands
>>> can now be executed as another user (BULK INSERT must be used in such case,
>>> see comments in the code) - issue #34
>>>
>>> On Fri, Jul 13, 2012 at 3:16 PM, Brandon Perry <
>>> [email protected]> wrote:
>>>
>>>> If you haven't made any changes to the source, you can git reset --hard
>>>> HEAD
>>>> On Jul 13, 2012 11:12 AM, "Iago Sousa" <[email protected]> wrote:
>>>>
>>>>> Yes, "Already on 'master'" show me when I put -f.
>>>>>
>>>>> On Fri, Jul 13, 2012 at 3:00 PM, Miroslav Stampar <
>>>>> [email protected]> wrote:
>>>>>
>>>>>> But have you tried with -f?
>>>>>> On Jul 13, 2012 7:51 PM, "Iago Sousa" <[email protected]> wrote:
>>>>>>
>>>>>>> Already on 'master'
>>>>>>> Your branch is behind 'origin/master' by 79 commits, and can be
>>>>>>> fast-forwarded.
>>>>>>>
>>>>>>> On Fri, Jul 13, 2012 at 2:47 PM, Miroslav Stampar <
>>>>>>> [email protected]> wrote:
>>>>>>>
>>>>>>>> Hi Iago.
>>>>>>>>
>>>>>>>> Try with:
>>>>>>>> git checkout -f master
>>>>>>>>
>>>>>>>> Kind regards,
>>>>>>>> Miroslav Stampar
>>>>>>>>
>>>>>>>> On Fri, Jul 13, 2012 at 7:43 PM, Iago Sousa <[email protected]>wrote:
>>>>>>>>
>>>>>>>>> I receive that error when I try to update with 'git pull'.
>>>>>>>>>
>>>>>>>>> error: Untracked working tree file 'extra/ansistrm/__init__.py'
>>>>>>>>> would be overwritten by merge. Aborting
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> ------------------------------------------------------------------------------
>>>>>>>>> Live Security Virtual Conference
>>>>>>>>> Exclusive live event will cover all the ways today's security and
>>>>>>>>> threat landscape has changed and how IT managers can respond.
>>>>>>>>> Discussions
>>>>>>>>> will include endpoint security, mobile security and the latest in
>>>>>>>>> malware
>>>>>>>>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>>>>>>>>> _______________________________________________
>>>>>>>>> sqlmap-users mailing list
>>>>>>>>> [email protected]
>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/sqlmap-users
>>>>>>>>>
>>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>> --
>>>>>>>> Miroslav Stampar
>>>>>>>> http://about.me/stamparm
>>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>> --
>>>>>>>
>>>>>>> Regards, Iago Sousa
>>>>>>> Webdesigner at Radar Topografia
>>>>>>> Programmer and Security Researcher
>>>>>>>
>>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>>
>>>>> Regards, Iago Sousa
>>>>> Webdesigner at Radar Topografia
>>>>> Programmer and Security Researcher
>>>>>
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> Live Security Virtual Conference
>>>>> Exclusive live event will cover all the ways today's security and
>>>>> threat landscape has changed and how IT managers can respond.
>>>>> Discussions
>>>>> will include endpoint security, mobile security and the latest in
>>>>> malware
>>>>> threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
>>>>> _______________________________________________
>>>>> sqlmap-users mailing list
>>>>> [email protected]
>>>>> https://lists.sourceforge.net/lists/listinfo/sqlmap-users
>>>>>
>>>>>
>>>
>>>
>>> --
>>>
>>> Regards, Iago Sousa
>>> Webdesigner at Radar Topografia
>>> Programmer and Security Researcher
>>>
>>>
>
>
> --
>
> Regards, Iago Sousa
> Webdesigner at Radar Topografia
> Programmer and Security Researcher
>
>
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
sqlmap-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/sqlmap-users
