delta/git.git, branch sb/diff-delta-remove-needless-comparison

create_delta_index: simplify condition always evaluating to true

2013-08-18T19:56:23+00:00

The code sequence  ' (1u << i) < hsize && i < 31 ' is a multi step
process, whose first step requires that 'i' is already less that 31,
otherwise the result (1u << i)  is undefined (and  'undef_val < hsize'
can therefore be assumed to be 'false'), and so the later test  i < 31
can always be optimized away as dead code ('i' is already less than 31,
or the short circuit 'and' applies).

So we need to get rid of that code. One way would be to exchange the
order of the conditions, so the expression 'i < 31 && (1u << i) < hsize'
would remove that optimized unstable code already.

However when checking the previous lines in that function, we can deduce
that 'hsize' must always be smaller than (1u<<31), since 506049c7df2c6
(fix >4GiB source delta assertion failure), because 'entries' is
capped at an upper bound of 0xfffffffeU, so 'hsize' contains a maximum
value of 0x3fffffff, which is smaller than (1u<<31), so the value of
'i' will never be larger than 31 and we can remove that condition
entirely.

Signed-off-by: Stefan Beller 
Acked-by: Nicolas Pitre 
Acked-by: Philip Oakley 
Signed-off-by: Junio C Hamano

Git 1.8.3

2013-05-24T18:34:46+00:00

Signed-off-by: Junio C Hamano

remote-hg: fix order of configuration comments

2013-05-21T16:33:24+00:00

The other configurations were added in the wrong place.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

remote-hg: trivial configuration note cleanup

2013-05-21T16:33:21+00:00

Follow the style of the previous configurations.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

completion: regression fix for zsh

2013-05-21T16:28:45+00:00

zsh completion wrapper doesn't reimplement __gitcompadd(). Although it
should be trivial to do that, let's use __gitcomp_nl() which achieves
exactly the same thing, specially since the suffix ($4) has to be empty.

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano

Merge git://git.bogomips.org/git-svn

2013-05-20T23:06:48+00:00

* git://git.bogomips.org/git-svn:
  git-svn: introduce --parents parameter for commands branch and tag
  git-svn: clarify explanation of --destination argument
  git-svn: multiple fetch/branches/tags keys are supported

git-svn: introduce --parents parameter for commands branch and tag

2013-05-20T22:05:54+00:00

This parameter is equivalent to the parameter --parents on svn cp commands
and is useful for non-standard repository layouts.

Signed-off-by: Tobias Schulte 
Signed-off-by: Eric Wong

git-svn: clarify explanation of --destination argument

2013-05-20T22:05:47+00:00

The existing documentation for "-d" does not make it obvious whether
its argument is supposed to be a full svn path, a partial svn path,
the glob from the config file, or what.  Clarify the text and add an
example to get the reader started.

Reported-by: Nathan Gray 
Signed-off-by: Jonathan Nieder 
Signed-off-by: Eric Wong

git-svn: multiple fetch/branches/tags keys are supported

2013-05-20T22:05:47+00:00

"git svn" can be configured to use multiple fetch, branches, and tags
refspecs by passing multiple --branches or --tags options at init time
or editing the configuration file later, which can be handy when
working with messy Subversion repositories.  Add a note to the
configuration section documenting how this works.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Eric Wong

remote-hg: set stdout to binary mode on win32

2013-05-20T18:18:43+00:00

git clone hangs on windows, and file.write would return errno 22 inside
of mercurial's windows.winstdout wrapper class. This patch sets stdout's
mode to binary, fixing both issues.

[fc: cleaned up]

Signed-off-by: Felipe Contreras 
Signed-off-by: Junio C Hamano