[PATCH] gnu: Add python-psycopg2, python2-psycopg2

[PATCH] gnu: Add python-psycopg2, python2-psycopg2

[Danny Milosavljevic]

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3dd3862..f121d27 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7529,3 +7529,32 @@ available in Django, but is a standalone package.")
     (inherit (package-with-python2
               (strip-python2-variant python-wtforms)))
     (inputs `(("python2-setuptools" ,python2-setuptools)))))
+
+(define-public python-psycopg2
+  (package
+    (name "python-psycopg2")
+    (version "2.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version ".tar.gz"))
+       (sha256
+        (base32
+         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; TODO re-enable
+    (inputs
+     `(("postgresql" ,postgresql))) ; libpq
+    (home-page "http://initd.org/psycopg/")
+    (synopsis "Python PostgreSQL adapter")
+    (description
+     "psycopg2 is a PostgreSQL adapter that implements DB-API 2.0")
+    (license lgpl3+)
+    (properties `((python2-variant . ,(delay python2-psycopg2))))))
+
+(define-public python2-psycopg2
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-psycopg2)))
+    (inputs `(("python2-setuptools" ,python2-setuptools)))))

Re: [PATCH] gnu: Add python-psycopg2, python2-psycopg2

[Leo Famulari]

On Fri, Feb 19, 2016 at 12:01:06PM +0100, Danny Milosavljevic wrote:
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm

Thanks for the patch!

Unfortunately, python.scm has changed since you made the patch, so the
patch no longer applies. Can you rebase on the current master and
regenerate the patch, incorporating the changes suggest below?

The commit message should include a line describing the changes.  You
can find some examples of the desired format in the git log.

And don't forget to add your name to the list of authors at the top of
the file :)

> index 3dd3862..f121d27 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7529,3 +7529,32 @@ available in Django, but is a standalone package.")
>      (inherit (package-with-python2
>                (strip-python2-variant python-wtforms)))
>      (inputs `(("python2-setuptools" ,python2-setuptools)))))
> +
> +(define-public python-psycopg2
> +  (package
> +    (name "python-psycopg2")
> +    (version "2.6.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "psycopg2" version ".tar.gz"))

".tar.gz" is the default pypi-uri extension, so you can leave it out.

> +       (sha256
> +        (base32
> +         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f)) ; TODO re-enable

Why are the tests disabled?

> +    (inputs
> +     `(("postgresql" ,postgresql))) ; libpq
> +    (home-page "http://initd.org/psycopg/")
> +    (synopsis "Python PostgreSQL adapter")
> +    (description
> +     "psycopg2 is a PostgreSQL adapter that implements DB-API 2.0")

The description should be a complete sentence, with a period at the end.
Bonus points for more detail :)

> +    (license lgpl3+)
> +    (properties `((python2-variant . ,(delay python2-psycopg2))))))
> +
> +(define-public python2-psycopg2
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-psycopg2)))
> +    (inputs `(("python2-setuptools" ,python2-setuptools)))))

Setuptools is typically used only at build time, so it should be a
native input.

Re: [PATCH] gnu: Add python-psycopg2, python2-psycopg2

[Danny Milosavljevic]

Hi,

On Fri, 19 Feb 2016 16:22:58 -0500
Leo Famulari <leo@famulari.name> wrote:

> > +     `(#:tests? #f)) ; TODO re-enable  
> 
> Why are the tests disabled?

Because it would require a postgresql database "psycopg2_test" and a running postgresql database management service.

Not sure what the usual way to do that is. Should it create the db on a temporary dbms service on-the-fly and drop it later?

Or we could mock out the server and just have it return constant stuff as if it was postgresql. Is that already available somewhere?

Re: [PATCH] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

Danny Milosavljevic writes:

> Hi,
>
> On Fri, 19 Feb 2016 16:22:58 -0500
> Leo Famulari <leo@famulari.name> wrote:
>
>> > +     `(#:tests? #f)) ; TODO re-enable  
>> 
>> Why are the tests disabled?
>
> Because it would require a postgresql database "psycopg2_test" and a
> running postgresql database management service.
>
> Not sure what the usual way to do that is. Should it create the db on
> a temporary dbms service on-the-fly and drop it later?
>
> Or we could mock out the server and just have it return constant stuff
> as if it was postgresql. Is that already available somewhere?

My personal suggestion would be to push to master without the tests for
now, and add a comment explaining why this is hard.  I think someone
needs to figure out a nice way to spin up a mini-service for running
postgres during tests; some of my stuff could use that too.  But we
should merge and push this with an additional comment.

Re: [PATCH] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

(Also, conveniently, this will be very useful for MediaGoblin users!  I
was going to package this myself, glad you beat me to it.  Could you add
the appropriate commented explaination?)

[PATCH v2] gnu: Add python-psycopg2, python2-psycopg2

[Danny Milosavljevic]

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..e1dbc31 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+(define-public python-psycopg2
+  (package
+    (name "python-psycopg2")
+    (version "2.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version))
+       (sha256
+        (base32
+         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; TODO re-enable after providing a test-db.
+     ; Tests would require a postgresql database "psycopg2_test"
+     ; and a running postgresql database management service.
+    (inputs
+     `(("postgresql" ,postgresql))) ; libpq
+    (home-page "http://initd.org/psycopg/")
+    (synopsis "Python PostgreSQL adapter")
+    (description
+     "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0.")
+    (license lgpl3+)
+    (properties `((python2-variant . ,(delay python2-psycopg2))))))
+
+(define-public python2-psycopg2
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-psycopg2)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))

Re: [PATCH v2] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

This looks pretty good.  And happily, I've tested with MediaGoblin, and
it works!  Horray!  A few things...

Danny Milosavljevic writes:

> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 55a62a9..e1dbc31 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -17,6 +17,7 @@

Could you use `git format-patch` to generate this patch instead?
Probably `git format-patch HEAD...origin/master` will work.  You can
look at the commit log to see the desired format, or read the Change Log
section of the GNU coding standards:

  https://www.gnu.org/prep/standards/html_node/Change-Logs.html

>  ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
>  ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
> +;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in code.")
>  
>  (define-public python2-sphinx-repoze-autointerface
>    (package-with-python2 python-sphinx-repoze-autointerface))
> +
> +(define-public python-psycopg2
> +  (package
> +    (name "python-psycopg2")
> +    (version "2.6.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "psycopg2" version))
> +       (sha256
> +        (base32
> +         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
> +    (build-system python-build-system)
> +    (arguments
> +     `(#:tests? #f)) ; TODO re-enable after providing a test-db.
> +     ; Tests would require a postgresql database "psycopg2_test"
> +     ; and a running postgresql database management service.

; comments comment a line, to the right of the line, so the #:tests?
line has it right.  However, the other ones should use two comments.
It might even be nicer if it goes to the right, like:

    (arguments
     ;; Tests would require a postgresql database "psycopg2_test"
     ;; and a running postgresql database management service.
     `(#:tests? #f)) ; TODO re-enable after providing a test-db.

or:

    (arguments
     `(;; Tests would require a postgresql database "psycopg2_test"
       ;; and a running postgresql database management service.
       #:tests? #f)) ; TODO re-enable after providing a test-db.

> +    (inputs
> +     `(("postgresql" ,postgresql))) ; libpq
> +    (home-page "http://initd.org/psycopg/")
> +    (synopsis "Python PostgreSQL adapter")
> +    (description
> +     "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0.")
> +    (license lgpl3+)
> +    (properties `((python2-variant . ,(delay python2-psycopg2))))))
> +
> +(define-public python2-psycopg2
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-psycopg2)))
> +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))

[PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Danny Milosavljevic]

---
 gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 55a62a9..35bb1c3 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -17,6 +17,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
 ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in code.")
 
 (define-public python2-sphinx-repoze-autointerface
   (package-with-python2 python-sphinx-repoze-autointerface))
+
+(define-public python-psycopg2
+  (package
+    (name "python-psycopg2")
+    (version "2.6.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "psycopg2" version))
+       (sha256
+        (base32
+         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
+    (build-system python-build-system)
+    (arguments
+     ;; Tests would require a postgresql database "psycopg2_test"
+     ;; and a running postgresql database management service.
+     `(#:tests? #f)) ; TODO re-enable after providing a test-db.
+    (inputs
+     `(("postgresql" ,postgresql))) ; libpq
+    (home-page "http://initd.org/psycopg/")
+    (synopsis "Python PostgreSQL adapter")
+    (description
+     "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ")
+    (license lgpl3+)
+    (properties `((python2-variant . ,(delay python2-psycopg2))))))
+
+(define-public python2-psycopg2
+  (package
+    (inherit (package-with-python2
+              (strip-python2-variant python-psycopg2)))
+    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
-- 
2.6.3

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

This looks ready to go, though it still lacks a changelog style commit
message, and it isn't formatted with git format-patch.

I could commit it myself with that, but I don't know if that would be
acceptable?  (And should I commit it under my name, or set the author
name to Danny?  I would certainly want to attribute to Danny.)

If we had a "git format-patch" version of this commit that would be
easiest.

Danny Milosavljevic writes:

> ---
>  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>  1 file changed, 32 insertions(+)
>
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 55a62a9..35bb1c3 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -17,6 +17,7 @@
>  ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
>  ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
> +;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in code.")
>  
>  (define-public python2-sphinx-repoze-autointerface
>    (package-with-python2 python-sphinx-repoze-autointerface))
> +
> +(define-public python-psycopg2
> +  (package
> +    (name "python-psycopg2")
> +    (version "2.6.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "psycopg2" version))
> +       (sha256
> +        (base32
> +         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
> +    (build-system python-build-system)
> +    (arguments
> +     ;; Tests would require a postgresql database "psycopg2_test"
> +     ;; and a running postgresql database management service.
> +     `(#:tests? #f)) ; TODO re-enable after providing a test-db.
> +    (inputs
> +     `(("postgresql" ,postgresql))) ; libpq
> +    (home-page "http://initd.org/psycopg/")
> +    (synopsis "Python PostgreSQL adapter")
> +    (description
> +     "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ")
> +    (license lgpl3+)
> +    (properties `((python2-variant . ,(delay python2-psycopg2))))))
> +
> +(define-public python2-psycopg2
> +  (package
> +    (inherit (package-with-python2
> +              (strip-python2-variant python-psycopg2)))
> +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Leo Famulari]

On Thu, Feb 25, 2016 at 09:53:17AM -0800, Christopher Allan Webber wrote:
> This looks ready to go, though it still lacks a changelog style commit
> message, and it isn't formatted with git format-patch.
> 
> I could commit it myself with that, but I don't know if that would be
> acceptable?  (And should I commit it under my name, or set the author
> name to Danny?  I would certainly want to attribute to Danny.)

It's actually possible to put anything you want in the '--author' field
when committing. There is also '--sign-off', which you can use to
indicate your approval of the author's patch. These options also exist
in some other git tools, notably `git am`.

> 
> If we had a "git format-patch" version of this commit that would be
> easiest.
> 
> Danny Milosavljevic writes:
> 
> > ---
> >  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
> >  1 file changed, 32 insertions(+)
> >
> > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> > index 55a62a9..35bb1c3 100644
> > --- a/gnu/packages/python.scm
> > +++ b/gnu/packages/python.scm
> > @@ -17,6 +17,7 @@
> >  ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
> >  ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
> >  ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
> > +;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
> >  ;;;
> >  ;;; This file is part of GNU Guix.
> >  ;;;
> > @@ -8156,3 +8157,34 @@ introspection of @code{zope.interface} instances in code.")
> >  
> >  (define-public python2-sphinx-repoze-autointerface
> >    (package-with-python2 python-sphinx-repoze-autointerface))
> > +
> > +(define-public python-psycopg2
> > +  (package
> > +    (name "python-psycopg2")
> > +    (version "2.6.1")
> > +    (source
> > +     (origin
> > +       (method url-fetch)
> > +       (uri (pypi-uri "psycopg2" version))
> > +       (sha256
> > +        (base32
> > +         "0k4hshvrwsh8yagydyxgmd0pjm29lwdxkngcq9fzfzkmpsxrmkva"))))
> > +    (build-system python-build-system)
> > +    (arguments
> > +     ;; Tests would require a postgresql database "psycopg2_test"
> > +     ;; and a running postgresql database management service.
> > +     `(#:tests? #f)) ; TODO re-enable after providing a test-db.
> > +    (inputs
> > +     `(("postgresql" ,postgresql))) ; libpq
> > +    (home-page "http://initd.org/psycopg/")
> > +    (synopsis "Python PostgreSQL adapter")
> > +    (description
> > +     "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. ")
> > +    (license lgpl3+)
> > +    (properties `((python2-variant . ,(delay python2-psycopg2))))))
> > +
> > +(define-public python2-psycopg2
> > +  (package
> > +    (inherit (package-with-python2
> > +              (strip-python2-variant python-psycopg2)))
> > +    (native-inputs `(("python2-setuptools" ,python2-setuptools)))))
> 

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

Leo Famulari writes:

> On Thu, Feb 25, 2016 at 09:53:17AM -0800, Christopher Allan Webber wrote:
>> This looks ready to go, though it still lacks a changelog style commit
>> message, and it isn't formatted with git format-patch.
>> 
>> I could commit it myself with that, but I don't know if that would be
>> acceptable?  (And should I commit it under my name, or set the author
>> name to Danny?  I would certainly want to attribute to Danny.)
>
> It's actually possible to put anything you want in the '--author' field
> when committing. There is also '--sign-off', which you can use to
> indicate your approval of the author's patch. These options also exist
> in some other git tools, notably `git am`.

Ok, good call.  I probably should have done --sign-off, which I forgot
to, but I did commit it under Danny and pushed it.

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Leo Famulari]

On Thu, Feb 25, 2016 at 01:28:54PM -0800, Christopher Allan Webber wrote:
> Leo Famulari writes:
> 
> > On Thu, Feb 25, 2016 at 09:53:17AM -0800, Christopher Allan Webber wrote:
> >> This looks ready to go, though it still lacks a changelog style commit
> >> message, and it isn't formatted with git format-patch.
> >> 
> >> I could commit it myself with that, but I don't know if that would be
> >> acceptable?  (And should I commit it under my name, or set the author
> >> name to Danny?  I would certainly want to attribute to Danny.)
> >
> > It's actually possible to put anything you want in the '--author' field
> > when committing. There is also '--sign-off', which you can use to
> > indicate your approval of the author's patch. These options also exist
> > in some other git tools, notably `git am`.
> 
> Ok, good call.  I probably should have done --sign-off, which I forgot
> to, but I did commit it under Danny and pushed it.

It's useful but not essential, especially since you can make it say
anything you want. The only way to *really* know who wrote what is to
sign everything cryptographically.

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Danny Milosavljevic]

Hi,

first, thanks for the review and test and commit.

On Thu, 25 Feb 2016 09:53:17 -0800
Christopher Allan Webber <cwebber@dustycloud.org> wrote:

> This looks ready to go, though it still lacks a changelog style commit
> message, 

I committed it locally, with a commit message... *shrugs*. 
I think git format-patch put the message into the subject.
Should I manually write a changelog-style blurb, too?

>and it isn't formatted with git format-patch.

Huh? After the local commit I called git format-patch to format it and the mail with the patch was created from its output.

btw: Now git pull merges every time I pull... hmmmmm...

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

Danny Milosavljevic writes:

> Hi,
>
> first, thanks for the review and test and commit.
>
> On Thu, 25 Feb 2016 09:53:17 -0800
> Christopher Allan Webber <cwebber@dustycloud.org> wrote:
>
>> This looks ready to go, though it still lacks a changelog style commit
>> message, 
>
> I committed it locally, with a commit message... *shrugs*. 
> I think git format-patch put the message into the subject.
> Should I manually write a changelog-style blurb, too?
>
>>and it isn't formatted with git format-patch.
>
> Huh? After the local commit I called git format-patch to format it and the mail with the patch was created from its output.
>
> btw: Now git pull merges every time I pull... hmmmmm...

If you committed your own patch to master, that's not the same as what
will be applied upstream.  I failed to push earlier today (someone else
had), but it's actually up now.  If you ensure that your commit is
actually upstream (check the logs) and you're on master you can do:

  git reset --hard origin/master

and that might help.

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Leo Famulari]

On Thu, Feb 25, 2016 at 02:45:04PM -0800, Christopher Allan Webber wrote:
> Danny Milosavljevic writes:
> 
> > Hi,
> >
> > first, thanks for the review and test and commit.
> >
> > On Thu, 25 Feb 2016 09:53:17 -0800
> > Christopher Allan Webber <cwebber@dustycloud.org> wrote:
> >
> >> This looks ready to go, though it still lacks a changelog style commit
> >> message, 
> >
> > I committed it locally, with a commit message... *shrugs*. 
> > I think git format-patch put the message into the subject.
> > Should I manually write a changelog-style blurb, too?
> >
> >>and it isn't formatted with git format-patch.
> >
> > Huh? After the local commit I called git format-patch to format it and the mail with the patch was created from its output.
> >
> > btw: Now git pull merges every time I pull... hmmmmm...
> 
> If you committed your own patch to master, that's not the same as what
> will be applied upstream.  I failed to push earlier today (someone else
> had), but it's actually up now.  If you ensure that your commit is
> actually upstream (check the logs) and you're on master you can do:
> 
>   git reset --hard origin/master

This will discard any other work you've done on the master branch.

I would do `git diff HEAD..origin/master` to see what the difference is.

Re: [PATCH v3] gnu: Add python-psycopg2, python2-psycopg2

[Christopher Allan Webber]

Leo Famulari writes:

> On Thu, Feb 25, 2016 at 02:45:04PM -0800, Christopher Allan Webber wrote:
>> Danny Milosavljevic writes:
>> 
>> > Hi,
>> >
>> > first, thanks for the review and test and commit.
>> >
>> > On Thu, 25 Feb 2016 09:53:17 -0800
>> > Christopher Allan Webber <cwebber@dustycloud.org> wrote:
>> >
>> >> This looks ready to go, though it still lacks a changelog style commit
>> >> message, 
>> >
>> > I committed it locally, with a commit message... *shrugs*. 
>> > I think git format-patch put the message into the subject.
>> > Should I manually write a changelog-style blurb, too?
>> >
>> >>and it isn't formatted with git format-patch.
>> >
>> > Huh? After the local commit I called git format-patch to format it and the mail with the patch was created from its output.
>> >
>> > btw: Now git pull merges every time I pull... hmmmmm...
>> 
>> If you committed your own patch to master, that's not the same as what
>> will be applied upstream.  I failed to push earlier today (someone else
>> had), but it's actually up now.  If you ensure that your commit is
>> actually upstream (check the logs) and you're on master you can do:
>> 
>>   git reset --hard origin/master
>
> This will discard any other work you've done on the master branch.
>
> I would do `git diff HEAD..origin/master` to see what the difference is.

Yeah, listen to Leo first before you listen to me :)

(Even if you listened to me first, if you don't garbage collect git, you
can get it back via the reflog, fyi)