diff options
author | Carl Worth <cworth@cworth.org> | 2009-10-21 23:23:32 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2009-10-21 23:23:44 -0700 |
commit | 84480738a5e225c145eeaac5c39bb858f6592e95 (patch) | |
tree | b7ffb46b6da669e8fd96db9bd18b20ff340c5500 /query.cc | |
parent | 2745575b9be7f94685fac6143d7bb64737550c10 (diff) | |
parent | 2ce552b5f783b6c761f473990df9ce93ef03dcf0 (diff) | |
parent | c58ee818b5e116d00172c8406149106c97c2e377 (diff) |
Merge branch from fixing up bugs after bisecting.
I'm glad that when I implemented "notmuch restore" I went through the
extra effort to take the code I had written in one sitting into over a
dozen commits. Sure enough, I hadn't tested well enough and had
totally broken "notmuch setup", (segfaults and bogus thread_id
values).
With the little commits I had made, git bisect saved the day, and I
went back to make the fixes right on top of the commits that
introduced the bugs. So now we octopus merge those in.