bpmcdevitt/exploit-db-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'xXxsomebodyoncetoldmexXx-main-patch-73439' into 'main'

Browse source 
Fixing "fatal: couldn't find remote ref master" error for new installer.

See merge request exploit-database/exploitdb!1
This commit is contained in:
g0t mi1k 2025-04-29 09:07:39 +00:00
commit e947b3fe8d
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
searchsploit
View file

@ -241,18 +241,21 @@ function updategit() {
git checkout -- . 2>/dev/null \ git checkout -- . 2>/dev/null \
|| sudo git checkout -- . || sudo git checkout -- .
# Get origin branch name
origin_branch=$(git branch -l master main | sed 's/^* //')
# Update from git # Update from git
echo -e "\n[i] Git pull'ing" echo -e "\n[i] Git pull'ing"
git pull -v upstream master 2>/dev/null \ git pull -v upstream $origin_branch 2>/dev/null \
|| sudo git pull -v upstream master || sudo git pull -v upstream $origin_branch
# If conflicts, clean and try again # If conflicts, clean and try again
if [[ "$?" -ne 0 ]]; then if [[ "$?" -ne 0 ]]; then
echo -e "\n[-] Git conflict" echo -e "\n[-] Git conflict"
git clean -d -fx "" \ git clean -d -fx "" \
|| sudo git clean -d -fx "" || sudo git clean -d -fx ""
git pull -v upstream master \ git pull -v upstream $origin_branch \
|| sudo git pull -v upstream master || sudo git pull -v upstream $origin_branch
fi fi
echo -e "\n[*] Git update finished" echo -e "\n[*] Git update finished"