Skip to content

Commit 64eba7a

Browse files
committed
Ignore broken git work directory at creating revision.h [ci skip]
1 parent de490a1 commit 64eba7a

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

tool/file2lastrev.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ def self.format=(format)
9898
data.sub!(/(?<!\A|\n)\z/, "\n")
9999
@output.write(data, overwrite: true, create_only: create_only)
100100
rescue => e
101+
next if @suppress_not_found and VCS::NotFoundError === e
101102
warn "#{File.basename(Program)}: #{e.message}"
102103
ok = false
103104
end

tool/lib/vcs.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ def _get_revisions(path, srcdir = nil)
479479
last = cmd_read_at(srcdir, [[*gitcmd, 'rev-parse', ref, err: w]]).rstrip
480480
w.close
481481
unless r.eof?
482-
raise "#{COMMAND} rev-parse failed\n#{r.read.gsub(/^(?=\s*\S)/, ' ')}"
482+
raise VCS::NotFoundError, "#{COMMAND} rev-parse failed\n#{r.read.gsub(/^(?=\s*\S)/, ' ')}"
483483
end
484484
end
485485
log = cmd_read_at(srcdir, [[*gitcmd, 'log', '-n1', '--date=iso', '--pretty=fuller', *path]])

0 commit comments

Comments
 (0)