Moved options to the options.go file

Signed-off-by: Eduardo Lezcano <[email protected]>

Author: Eduardo Lezcano

options.go

@@ -431,3 +431,33 @@ type PlainOpenOptions struct {
 
 // Validate validates the fields and sets the default values.
 func (o *PlainOpenOptions) Validate() error { return nil }
+
+// DescribeOptions as defined by `git describe`
+type DescribeOptions struct {
+	// Contains find the tag that comes after the commit
+	//Contains bool
+	// Debug search strategy on stderr
+	//Debug bool
+	// All Use any reference
+	//All bool
+	// Tags use any tag, even unannotated
+	//Tags bool
+	// FirstParent only follow first parent
+	//FirstParent bool
+	// Use <Abbrev> digits to display SHA-1s
+	// By default is 8
+	//Abbrev int
+	// Only output exact matches
+	//ExactMatch bool
+	// Consider <Candidates> most recent tags
+	// By default is 10
+	//Candidates int
+	// Only consider tags matching <Match> pattern
+	//Match string
+	// Show abbreviated commit object as fallback
+	//Always bool
+	// Append <mark> on dirty working tree (default: "-dirty")
+	Dirty string
+}
+
+func (o *DescribeOptions) Validate() error { return nil }

repository.go

@@ -1224,33 +1224,6 @@ func (r *Repository) createNewObjectPack(cfg *RepackConfig) (h plumbing.Hash, er
 	return h, err
 }
 
-type DescribeOptions struct {
-	// Contains find the tag that comes after the commit
-	//Contains bool
-	// Debug search strategy on stderr
-	//Debug bool
-	// All Use any reference
-	//All bool
-	// Tags use any tag, even unannotated
-	//Tags bool
-	// FirstParent only follow first parent
-	//FirstParent bool
-	// Use <Abbrev> digits to display SHA-1s
-	// By default is 8
-	//Abbrev int
-	// Only output exact matches
-	//ExactMatch bool
-	// Consider <Candidates> most recent tags
-	// By default is 10
-	//Candidates int
-	// Only consider tags matching <Match> pattern
-	//Match string
-	// Show abbreviated commit object as fallback
-	//Always bool
-	// Append <mark> on dirty working tree (default: "-dirty")
-	Dirty string
-}
-
 type Describe struct {
 	// Reference being described
 	Reference *plumbing.Reference
@@ -1272,7 +1245,10 @@ func (d *Describe) String() string {
 
 // Describe just like the `git describe` command will return a Describe struct for the hash passed.
 // Describe struct implements String interface so it can be easily printed out.
-func (r *Repository) Describe(ref *plumbing.Reference, options *DescribeOptions) (*Describe, error) {
+func (r *Repository) Describe(ref *plumbing.Reference, opts *DescribeOptions) (*Describe, error) {
+	if err := opts.Validate(); err != nil {
+		return nil, err
+	}
 
 	// Fetch the reference log
 	commitIterator, err := r.Log(&LogOptions{
@@ -1313,7 +1289,7 @@ func (r *Repository) Describe(ref *plumbing.Reference, options *DescribeOptions)
 		ref,
 		tag,
 		count,
-		options.Dirty,
+		opts.Dirty,
 	}, nil
 
 }