Re: What's cooking in git.git (Sep 2013, #05; Wed, 18)

2013-09-19 Thread Patrick Welche
On Thu, Sep 19, 2013 at 11:10:39AM -0700, Junio C Hamano wrote:
> Matthieu Moy  writes:
> 
> > Junio C Hamano  writes:
> >
> >> * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
> >>   (merged to 'next' on 2013-09-13 at 82e8b91)
> >>  + rebase: fix run_specific_rebase's use of "return" on FreeBSD
> >>
> >>  Work around a bug in FreeBSD shell that caused a regression to "git
> >>  rebase" in v1.8.4.  It would be lovely to hear from FreeBSD folks a
> >>  success report 
> >
> > We just did:
> >
> >   http://thread.gmane.org/gmane.comp.version-control.git/234825/focus=234870
> 
> That only talks about "more" not showing colors.
> 
> ... goes and looks ...
> 
> Ah, there is another subthread that ends at 234833 that reports
> success; I am guessing from "pkgsrc" that this is either some
> variant of BSD or Solaris?

Sorry - I unsubscribed in the meantime. My rebase problem was on
NetBSD, your FreeBSD work around worked for me too, and I added
your patch to pkgsrc.

Thanks again,

Patrick
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: What's cooking in git.git (Sep 2013, #05; Wed, 18)

2013-09-19 Thread Junio C Hamano
Matthieu Moy  writes:

> Junio C Hamano  writes:
>
>> * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
>>   (merged to 'next' on 2013-09-13 at 82e8b91)
>>  + rebase: fix run_specific_rebase's use of "return" on FreeBSD
>>
>>  Work around a bug in FreeBSD shell that caused a regression to "git
>>  rebase" in v1.8.4.  It would be lovely to hear from FreeBSD folks a
>>  success report 
>
> We just did:
>
>   http://thread.gmane.org/gmane.comp.version-control.git/234825/focus=234870

That only talks about "more" not showing colors.

... goes and looks ...

Ah, there is another subthread that ends at 234833 that reports
success; I am guessing from "pkgsrc" that this is either some
variant of BSD or Solaris?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: What's cooking in git.git (Sep 2013, #05; Wed, 18)

2013-09-19 Thread Matthieu Moy
Junio C Hamano  writes:

> * mm/rebase-continue-freebsd-WB (2013-09-09) 1 commit
>   (merged to 'next' on 2013-09-13 at 82e8b91)
>  + rebase: fix run_specific_rebase's use of "return" on FreeBSD
>
>  Work around a bug in FreeBSD shell that caused a regression to "git
>  rebase" in v1.8.4.  It would be lovely to hear from FreeBSD folks a
>  success report 

We just did:

  http://thread.gmane.org/gmane.comp.version-control.git/234825/focus=234870

>  Will merge to 'master' in the fifth batch.

Don't forget maint, too.

Thanks,

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


What's cooking in git.git (Sep 2013, #05; Wed, 18)

2013-09-18 Thread Junio C Hamano
Here are the topics that have been cooking.  Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

The fourth batch of topics are in 'master'.

By the way, I'm scheduled to be offline starting next week for a few
weeks; for the past two autumns, Peff played the role of the interim
maintainer and took good care of the project during my absense. This
time around, to improve the "bus factor", I asked Jonathan Nieder to
fill in for me (with Peff as a back-up help).

A big "Thanks!" to both of them.

You can find the changes described here in the integration branches
of the repositories listed at

http://git-blame.blogspot.com/p/git-public-repositories.html

--
[Graduated to "master"]

* ab/gitweb-author-initials (2013-08-30) 1 commit
  (merged to 'next' on 2013-09-09 at ecb924d)
 + gitweb: Fix the author initials in blame for non-ASCII names


* ap/commit-author-mailmap (2013-08-24) 1 commit
  (merged to 'next' on 2013-09-09 at 79d5a20)
 + commit: search author pattern against mailmap

 "git commit --author=$name", when $name is not in the canonical
 "A. U. Thor " format, looks for a matching name
 from existing history, but did not consult mailmap to grab the
 preferred author name.


* bc/send-email-ssl-die-message-fix (2013-09-10) 1 commit
  (merged to 'next' on 2013-09-13 at c6fcdf4)
 + send-email: don't call methods on undefined values

 When send-email comes up with an error message to die with upon
 failure to start an SSL session, it tried to read the error string
 from a wrong place.


* dw/diff-no-index-doc (2013-08-28) 2 commits
  (merged to 'next' on 2013-09-10 at 423c8f6)
 + diff --no-index: describe in a separate paragraph
 + diff --no-index: clarify operation when not inside a repository

 When the user types "git diff" outside a working tree, thinking he
 is inside one, the current error message that is a single-liner
 "usage: git diff --no-index  " may not be sufficient to
 make him realize the mistake. Add "Not a git repository" to the
 error message when we fell into the "--no-index" mode without an
 explicit command line option to instruct us to do so.


* fc/contrib-bzr-hg-fixes (2013-09-03) 10 commits
  (merged to 'next' on 2013-09-12 at f5e8684)
 + contrib/remote-helpers: quote variable references in redirection targets
 + contrib/remote-helpers: style updates for test scripts
 + remote-hg: use notes to keep track of Hg revisions
 + remote-helpers: cleanup more global variables
 + remote-helpers: trivial style fixes
 + remote-hg: improve basic test
 + remote-hg: add missing &&s in the test
 + remote-hg: fix test
 + remote-bzr: make bzr branches configurable per-repo
 + remote-bzr: fix export of utf-8 authors


* fc/fast-export (2013-09-03) 2 commits
  (merged to 'next' on 2013-09-09 at 8d5d396)
 + fast-export: refactor get_tags_and_duplicates()
 + fast-export: make extra_refs global

 Code simpification.


* fc/rev-parse-test-updates (2013-09-03) 4 commits
  (merged to 'next' on 2013-09-09 at 92c51ef)
 + rev-parse test: use standard test functions for setup
 + rev-parse test: use test_cmp instead of "test" builtin
 + rev-parse test: use test_must_fail, not "if ; then false; fi"
 + rev-parse test: modernize quoting and whitespace

 Modernize tests.


* fc/t3200-fixes (2013-09-03) 3 commits
  (merged to 'next' on 2013-09-09 at 3626363)
 + t: branch: fix broken && chains
 + t: branch: fix typo
 + t: branch: trivial style fix


* fc/trivial (2013-09-08) 5 commits
  (merged to 'next' on 2013-09-09 at a8ad2e1)
 + pull: use $curr_branch_short more
 + add: trivial style cleanup
 + reset: trivial style cleanup
 + branch: trivial style fix
 + reset: trivial refactoring


* jc/cvsserver-perm-bit-fix (2013-09-11) 1 commit
  (merged to 'next' on 2013-09-13 at 56db105)
 + cvsserver: pick up the right mode bits

 "git cvsserver" computed the permission mode bits incorrectly for
 executable files.


* jc/url-match (2013-09-12) 1 commit
  (merged to 'next' on 2013-09-13 at 7b94f8e)
 + urlmatch.c: recompute pointer after append_normalized_escapes

 While normalizing a URL, we forgot that the buffer that holds it
 could be relocated when it grows, which was a brown-paper-bag bug
 that can lead to a crash introduced on 'master' post 1.8.4 release.


* jk/duplicate-objects-in-packs (2013-09-04) 5 commits
  (merged to 'next' on 2013-09-09 at 72f2c3d)
 + t5308: check that index-pack --strict detects duplicate objects
 + test index-pack on packs with recoverable delta cycles
 + add tests for indexing packs with delta cycles
 + sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
 + test-sha1: add a binary output mode

 A packfile that stores the same object more than once is broken and
 will be rejected.


* jk/free-tree-buffer (2013-06-06) 1 commit
  (merged to 'next' on 2013-09-09 at 3576189)
 + clear parsed flag when we free tree buffers


* jk/has-sha1-file-retry-packed (2013-08-30) 1 commit
  (merg