delta/git.git, branch ab/completion-push-delete-ref

completion: expand "push --delete " for refs on that

2017-04-24T00:30:59+00:00

Change the completion of "push --delete  " to complete
refs on that , not all refs.

Before this cloning git.git and doing "git push --delete origin
p" will complete nothing, since a fresh clone of git.git will
have no "pu" branch, whereas origin/p will uselessly complete
origin/pu, but fully qualified references aren't accepted by
"--delete".

Now p will complete as "pu". The completion of giving --delete
later, e.g. "git push origin --delete p" remains unchanged, this
is a bug, but is a general existing limitation of the bash completion,
and not how git-push is documented, so I'm not fixing that case, but
adding a failing TODO test for it.

The testing code was supplied by SZEDER Gábor in
<20170421122832.24617-1-szeder.dev@gmail.com> with minor setup
modifications on my part.

Signed-off-by: Ævar Arnfjörð Bjarmason 
Reviewed-by: SZEDER Gábor 
Test-code-by: SZEDER Gábor 
Signed-off-by: Junio C Hamano

Twelfth batch for 2.13

2017-04-17T06:30:49+00:00

Signed-off-by: Junio C Hamano

Merge branch 'js/difftool-builtin'

2017-04-17T06:29:34+00:00

Code cleanup.

* js/difftool-builtin:
  difftool: fix use-after-free
  difftool: avoid strcpy

Merge branch 'sb/unpack-trees-would-lose-submodule-message-update'

2017-04-17T06:29:34+00:00

Update an error message.

* sb/unpack-trees-would-lose-submodule-message-update:
  unpack-trees.c: align submodule error message to the other error messages

Merge branch 'ab/regen-perl-mak-with-different-perl'

2017-04-17T06:29:33+00:00

Update the build dependency so that an update to /usr/bin/perl
etc. result in recomputation of perl.mak file.

* ab/regen-perl-mak-with-different-perl:
  perl: regenerate perl.mak if perl -V changes

Merge branch 'sb/show-diff-for-submodule-in-diff-fix'

2017-04-17T06:29:32+00:00

"git diff --submodule=diff" learned to work better in a project
with a submodule that in turn has its own submodules.

* sb/show-diff-for-submodule-in-diff-fix:
  diff: submodule inline diff to initialize env array.

Merge branch 'qp/bisect-docfix'

2017-04-17T06:29:31+00:00

Doc update.

* qp/bisect-docfix:
  git-bisect.txt: add missing word

Merge branch 'mm/ls-files-s-doc'

2017-04-17T06:29:30+00:00

Doc update.

* mm/ls-files-s-doc:
  Documentation: document elements in "ls-files -s" output in order

Merge branch 'jk/loose-object-info-report-error'

2017-04-17T06:29:30+00:00

Update error handling for codepath that deals with corrupt loose
objects.

* jk/loose-object-info-report-error:
  index-pack: detect local corruption in collision check
  sha1_loose_object_info: return error for corrupted objects

Merge branch 'jc/bs-t-is-not-a-tab-for-sed'

2017-04-17T06:29:29+00:00

Code cleanup.

* jc/bs-t-is-not-a-tab-for-sed:
  contrib/git-resurrect.sh: do not write \t for HT in sed scripts