delta/git.git, branch mr/worktree-list

worktree: add 'list' command

2015-10-08T18:57:14+00:00

'git worktree list' iterates through the worktree list, and outputs
details of the worktree including the path to the worktree, the currently
checked out revision and branch, and if the work tree is bare.  There is
also porcelain format option available.

Signed-off-by: Michael Rappazzo 
Signed-off-by: Junio C Hamano

worktree: add details to the worktree struct

2015-10-08T18:57:07+00:00

In addition to the absolute path in the worktree struct, add the location
of the git dir, the head ref (if not detached), the head revision sha1,
whether or not head is detached, and whether or not the worktree is a
bare repo.

Signed-off-by: Michael Rappazzo 
Signed-off-by: Junio C Hamano

worktree: add a function to get worktree details

2015-10-08T18:56:25+00:00

The worktree structure provided for an individual worktree includes the
absolute path of the worktree.  The fuction to get the worktree details
is a refactor of the find main/linked symref functions.

Signed-off-by: Michael Rappazzo 
Signed-off-by: Junio C Hamano

worktree: refactor find_linked_symref function

2015-10-08T18:56:05+00:00

Refactoring will help transition this code to provide additional useful
worktree functions.

Signed-off-by: Michael Rappazzo 
Signed-off-by: Junio C Hamano

worktree: add top-level worktree.c

2015-10-02T20:07:38+00:00

worktree.c contains functions to work with and get information from
worktrees.  This introduction moves functions related to worktrees
from branch.c into worktree.c

Signed-off-by: Michael Rappazzo 
Signed-off-by: Junio C Hamano

Git 2.6-rc3

2015-09-21T20:26:13+00:00

Signed-off-by: Junio C Hamano

Merge branch 'rj/mailmap-ramsay'

2015-09-21T19:58:35+00:00

* rj/mailmap-ramsay:
  mailmap: update my entry with new email address

Merge branch 'bn/send-email-smtp-auth-error-message-fix'

2015-09-21T19:27:15+00:00

Fix a minor regression brought in to "git send-email" by a recent
addition of the "--smtp-auth" option.

* bn/send-email-smtp-auth-error-message-fix:
  send-email: fix uninitialized var warning for $smtp_auth

Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po

2015-09-21T17:54:07+00:00

l10n-2.6.0-rnd2 plus de

* tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po: (25 commits)
  l10n: de.po: better language for one string
  l10n: de.po: translate 2 messages
  l10n: Update and review Vietnamese translation (2440t)
  l10n: fr.po v2.6.0 round 2 (2440t)
  l10n: zh_CN: for git v2.6.0 l10n round 2
  l10n: ca.po: update translation
  l10n: git.pot: v2.6.0 round 2 (3 improvements)
  l10n: de.po: translate 123 new messages
  l10n: fr.po v2.6.0 round 1 (2441t)
  l10n: sv.po: Update Swedish translation (2441t0f0u)
  l10n: zh_CN: for git v2.6.0 l10n round 1
  l10n: Updated Vietnamese translation (2441t)
  l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)
  l10n: zh_CN: Update Git Glossary: "commit message"
  l10n: zh_CN: Update Git Glossary: pickaxe
  l10n: zh_CN: Update Git Glossary: fork
  l10n: zh_CN: Update Git Glossary: tag
  l10n: zh_CN: Update Git Glossary: "dumb", "smart"
  l10n: zh_CN: Update Git Glossary: SHA-1
  l10n: zh_CN: Add Surrounding Spaces
  ...

send-email: fix uninitialized var warning for $smtp_auth

2015-09-21T17:51:19+00:00

On the latest version of git-send-email, I see this error just before
running SMTP auth (I didn't provide any --smtp-auth= parameter):

  Use of uninitialized value $smtp_auth in pattern match (m//) at \
  /home/briannorris/git/git/git-send-email.perl line 1139.

Signed-off-by: Brian Norris 
Reviewed-by: Eric Sunshine 
Signed-off-by: Junio C Hamano