delta/git.git, branch nd/diff-with-path-params

diff: make -O and --output work in subdirectory

2016-01-21T18:45:13+00:00

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

diff-no-index: do not take a redundant prefix argument

2016-01-21T18:45:11+00:00

Prefix is already set up in "revs". The same prefix should be used for
all options parsing. So kill the last argument. This patch does not
actually change anything because the only caller does use the same
prefix for init_revisions() and diff_no_index().

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Junio C Hamano

Git 2.6.5

2016-01-04T22:06:00+00:00

Signed-off-by: Junio C Hamano

Merge branch 'jk/pending-keep-tag-name' into maint

2016-01-04T22:03:08+00:00

History traversal with "git log --source" that starts with an
annotated tag failed to report the tag as "source", due to an
old regression in the command line parser back in v2.2 days.

* jk/pending-keep-tag-name:
  revision.c: propagate tag names from pending array

Merge branch 'jk/symbolic-ref-maint' into maint

2016-01-04T22:02:58+00:00

"git symbolic-ref" forgot to report a failure with its exit status.

* jk/symbolic-ref-maint:
  t1401: test reflog creation for git-symbolic-ref
  symbolic-ref: propagate error code from create_symref()

Merge branch 'jk/ident-loosen-getpwuid' into maint

2016-01-04T22:02:57+00:00

When getpwuid() on the system returned NULL (e.g. the user is not
in the /etc/passwd file or other uid-to-name mappings), the
codepath to find who the user is to record it in the reflog barfed
and died.  Loosen the check in this codepath, which already accepts
questionable ident string (e.g. host part of the e-mail address is
obviously bogus), and in general when we operate fmt_ident() function
in non-strict mode.

* jk/ident-loosen-getpwuid:
  ident: loosen getpwuid error in non-strict mode
  ident: keep a flag for bogus default_email
  ident: make xgetpwuid_self() a static local helper

Merge branch 'jk/send-email-ssl-errors' into maint

2016-01-04T22:02:55+00:00

Improve error reporting when SMTP TLS fails.

* jk/send-email-ssl-errors:
  send-email: enable SSL level 1 debug output

Merge branch 'sg/completion-no-column' into maint

2016-01-04T22:02:47+00:00

The completion script (in contrib/) used to list "git column"
(which is not an end-user facing command) as one of the choices

* sg/completion-no-column:
  completion: remove 'git column' from porcelain commands

t1401: test reflog creation for git-symbolic-ref

2015-12-21T20:06:31+00:00

The current code writes a reflog entry whenever we update a
symbolic ref, but we never test that this is so. Let's add a
test to make sure upcoming refactoring doesn't cause a
regression.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

symbolic-ref: propagate error code from create_symref()

2015-12-21T20:03:03+00:00

If create_symref() fails, git-symbolic-ref will still exit
with code 0, and our caller has no idea that the command did
nothing.

This appears to have been broken since the beginning of time
(e.g., it is not a regression where create_symref() stopped
calling die() or something similar).

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano