diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-01 20:47:00 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2019-05-01 20:47:00 +0900 |
| commit | 474af9ee9a4804d052e1e40503e1b6491d00a969 (patch) | |
| tree | 17c372ab3a21d70385904524e56bd840cbcee5af | |
| parent | 2f0f9115d314d0fecbd0a9f5b5a6c59c611fa5e7 (diff) | |
| download | ruby-474af9ee9a4804d052e1e40503e1b6491d00a969.tar.gz | |
No last commit when up-to-date
Get the last commit title from the upstream to the head, so that
no `last_commit` line will be shown when the branch is up to date
with the upstream.
| -rw-r--r-- | tool/vcs.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb index f4a10c81f1..f85b57e3cf 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -402,7 +402,9 @@ class VCS modified = log[/^Date:\s+(.*)/, 1] branch = cmd_read_at(srcdir, [gitcmd + %W[symbolic-ref --short HEAD]]) branch.chomp! - title = cmd_read_at(srcdir, [gitcmd + %W[log --format=%s -n1 FETCH_HEAD..HEAD]]) + upstream = cmd_read_at(srcdir, [gitcmd + %W[branch --list --format=%(upstream:short) #${branch}]]) + upstream.chomp! + title = cmd_read_at(srcdir, [gitcmd + %W[log --format=%s -n1 #{upstream}..HEAD]]) title = nil if title.empty? [last, changed, modified, branch, title] end |