* [PATCH] gcc-changelog: checkout & pull order
@ 2020-06-18 12:44 Martin Liška
0 siblings, 0 replies; only message in thread
From: Martin Liška @ 2020-06-18 12:44 UTC (permalink / raw)
To: gcc-patches
This fixes an order of commands.
Installed to master.
contrib/ChangeLog:
* gcc-changelog/git_update_version.py: First checkout and then
run git pull ---rebase.
---
contrib/gcc-changelog/git_update_version.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/gcc-changelog/git_update_version.py b/contrib/gcc-changelog/git_update_version.py
index 7077880cf80..ac1b206d238 100755
--- a/contrib/gcc-changelog/git_update_version.py
+++ b/contrib/gcc-changelog/git_update_version.py
@@ -137,8 +137,8 @@ else:
else:
branch = repo.create_head(name, ref).set_tracking_branch(ref)
print('=== Working on: %s ===' % branch, flush=True)
- origin.pull(rebase=True)
branch.checkout()
+ origin.pull(rebase=True)
print('branch pulled and checked out')
update_current_branch()
assert not repo.index.diff(None)
--
2.27.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-06-18 12:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-18 12:44 [PATCH] gcc-changelog: checkout & pull order Martin Liška
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).