Skip to content

Commit 58d9f16

Browse files
fix: check for error before reading parent (#84)
Co-authored-by: Joe Chen <jc@unknwon.io>
1 parent 34a6ca3 commit 58d9f16

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

repo_diff.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ func (r *Repository) Diff(rev string, maxFiles, maxFileLines, maxLineChars int,
4545
AddOptions(opt.CommandOptions).
4646
AddArgs("--full-index", rev)
4747
} else {
48-
c, _ := commit.Parent(0)
48+
c, err := commit.Parent(0)
49+
if err != nil {
50+
return nil, err
51+
}
4952
cmd = cmd.AddArgs("diff").
5053
AddOptions(opt.CommandOptions).
5154
AddArgs("--full-index", "-M", c.ID.String(), rev)
@@ -111,7 +114,10 @@ func (r *Repository) RawDiff(rev string, diffType RawDiffFormat, w io.Writer, op
111114
AddOptions(opt.CommandOptions).
112115
AddArgs("--full-index", rev)
113116
} else {
114-
c, _ := commit.Parent(0)
117+
c, err := commit.Parent(0)
118+
if err != nil {
119+
return err
120+
}
115121
cmd = cmd.AddArgs("diff").
116122
AddOptions(opt.CommandOptions).
117123
AddArgs("--full-index", "-M", c.ID.String(), rev)
@@ -122,7 +128,10 @@ func (r *Repository) RawDiff(rev string, diffType RawDiffFormat, w io.Writer, op
122128
AddOptions(opt.CommandOptions).
123129
AddArgs("--full-index", "--no-signature", "--stdout", "--root", rev)
124130
} else {
125-
c, _ := commit.Parent(0)
131+
c, err := commit.Parent(0)
132+
if err != nil {
133+
return err
134+
}
126135
cmd = cmd.AddArgs("format-patch").
127136
AddOptions(opt.CommandOptions).
128137
AddArgs("--full-index", "--no-signature", "--stdout", rev+"..."+c.ID.String())

0 commit comments

Comments
 (0)