Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-09-22 13:01:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

ecode: fix stale and symbolic remote branch entries

Browse Source 
Exclude symbolic remote refs such as origin/HEAD from the branch list.
Remove the corresponding local remote-tracking ref after deleting a
remote branch, and prune stale refs when pulling.
This commit is contained in:
Martín Lucas Golini
2026-09-06 21:39:11 -03:00
parent 90499462ea
commit 827f5d7524
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/ecode/plugins/git/git.cpp
View File

@@ -774,7 +774,7 @@ std::string Git::setSafeDirectory( const std::string& projectDir ) const {
}
Git::Result Git::pull( const std::string& projectDir ) {
return gitSimple( "pull", projectDir );
return gitSimple( "pull --prune", projectDir );
}
Git::Result Git::push( const std::string& projectDir ) {
@@ -979,6 +979,12 @@ Git::Result Git::deleteRemoteBranch( const std::string& remote, const std::strin
const std::string& projectDir ) {
Result result;
result.returnCode = git( { "push", remote, "--delete", branch }, projectDir, result.result );
if ( result.success() ) {
std::string cleanupResult;
result.returnCode = git( { "update-ref", "-d", "refs/remotes/" + remote + "/" + branch },
projectDir, cleanupResult );
result.result.append( cleanupResult );
}
return result;
}
@@ -1148,7 +1154,7 @@ Git::Branch parseLocalBranch( const std::string_view& raw ) {
static Git::Branch parseRemoteBranch( std::string_view raw ) {
auto split = String::split( raw, '\t', true );
if ( split.size() < 4 )
if ( split.size() < 4 || ( split.size() > 5 && !split[5].empty() ) )
return {};
std::string name( std::string{ split[1] } );
std::string remote( std::string{ split[1] } );
@@ -1176,7 +1182,7 @@ static Git::Branch parseTag( std::string_view raw ) {
std::vector<Git::Branch> Git::getAllBranchesAndTags( RefType ref, std::string_view filterBranch,
const std::string& projectDir ) {
// clang-format off
std::string args( "for-each-ref --format '%(refname) %(refname:short) %(upstream:short) %(objectname) %(upstream:track,nobracket)' --sort=v:refname" );
std::string args( "for-each-ref --format '%(refname) %(refname:short) %(upstream:short) %(objectname) %(upstream:track,nobracket) %(symref)' --sort=v:refname" );
// clang-format on
if ( filterBranch.empty() ) {