Tomas,
I've been hating you for the last 40 minutes of my life ;) The
good thing is now I know about "git cherry-pick"!
So, what happen is that you developed all your features in the
same branch, which makes things harder for me to review and merge
individually. You can see this in these two pull requests:
* https://github.com/andresriancho/w3af/pull/195
* https://github.com/andresriancho/w3af/pull/194
194 looks fine, but 195 is incorrect because of various reasons:
* It includes the commit from 194 (file: add bruteforce files
to dir_bruter), mainly because you developed the whole thing in the
same branch.
* It includes two different features in the same pull-request
(common mistake)
The issue of using the same branch also lead to tvelazquez@210bb5f
not being part of the pull request.
After using "git branch", "git reset --hard" and "git cherry-pick"
for a while, I was able to create three different branches in my local
repo: dwsync_xml, ds_store, filebrute:
* 75224ab - (3 days ago) add plugin dwsync_xml — Tomas Velazquez
(HEAD, dwsync_xml)
| * f0c1b5b - (3 days ago) add plugin ds_store — Tomas Velazquez (ds_store)
|/
| * 159a7fb - (16 hours ago) add filename and path bruteforce by the
correct way — Tomas Velazquez (filebrute)
| * 2f2aae1 - (4 days ago) add bruteforce files to dir_bruter — Tomas Velazquez
|/
* 874c67d - (8 days ago) Skip evasion tests which I'm not sure how to
fix. Also creating issue #193 — Andres Riancho (origin/threading2,
threading2)
Now that we have these branches [0], I recommend you update your
fork and continue any development associated with each feature in the
corresponding branch. Remember: "git checkout foobar" moves your
workdir to that branch.
I'll be testing the filebrute branch now and potentially merging
in some minutes,
In the future, I think that this can be avoided by following this guide:
https://github.com/andresriancho/w3af/wiki/Contributing-101
Git / Github is new for most of us, lets experiment and learn :D
[0] https://github.com/andresriancho/w3af/branches
Regards,
--
Andrés Riancho
Project Leader at w3af - http://w3af.org/
Web Application Attack and Audit Framework
Twitter: @w3af
GPG: 0x93C344F3
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
_______________________________________________
W3af-develop mailing list
W3af-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/w3af-develop
