From 74f1fd8c6da964fa55ab3fe1d82a005d28f3dd6a Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Mon, 20 Oct 2014 15:01:31 +0200 Subject: [PATCH] use git-fetch --prune otherwise dead mainlines accumulate, as for example when we changed branching schemes. Change-Id: Ia5bcb90a079dc62c3c848d139cef5f6d6e0ccbba Reviewed-by: Orgad Shaneh <orgads@gmail.com> --- git-hooks/gerrit-bot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-hooks/gerrit-bot b/git-hooks/gerrit-bot index bdd64b1..918b3fe 100755 --- a/git-hooks/gerrit-bot +++ b/git-hooks/gerrit-bot @@ -128,7 +128,7 @@ sub process_commit($$$$$) chomp(@mainlines = `git config remote.origin.fetch`); $skipfetch{$project} = 1; } - if (system("git", "fetch", "-f", "origin", $ref.":refs/changes/".$number, @mainlines)) { + if (system("git", "fetch", "-f", "--prune", "origin", $ref.":refs/changes/".$number, @mainlines)) { printerr "GIT fetch of ".$ref." from ".$project." failed"; return; } -- GitLab