Before a branch is deleted, we check that it points to a valid
commit.  With -d we also check that the commit is a merged; this
check is not done with -D.

The reason for that is that commits pointed to by branches should
never go missing; if they do then something broke and it's better
to stop instead of adding to the mess.  And a non-merged commit
may contain changes that are worth preserving, so we require the
stronger option -D instead of -d to get rid of them.

If a branch consists of a symref, these concerns don't apply.
Deleting such a branch can't make a commit become unreferenced,
so we don't need to check if it is merged, or even if it is
actually a valid commit.  Skip them in that case.  This allows
us to delete dangling symref branches.
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

If a branch that is to be deleted happens to be a symref to another
branch, the current code removes the targeted branch instead of the
one it was called for.

Change this surprising behaviour and delete the symref branch
instead.
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Provide a small helper function for deleting branch config sections.
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Move the code to perform checks on the tip commit of a branch
to its own function.
Signed-off-by: NRene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* git://github.com/git-l10n/git-po:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55
  l10n: Update Swedish translation (1964t0f0u)

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them

* bw/cp-a-is-gnuism:
  tests: "cp -a" is a GNUism

* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning

* jc/doc-long-options:
  gitcli: parse-options lets you omit tail of long options

* jc/maint-t1450-fsck-order-fix:
  t1450: the order the objects are checked is undefined

* rr/test-use-shell-path-not-shell:
  test-lib: use $SHELL_PATH, not $SHELL

* rr/test-make-sure-we-have-git:
  t/test-lib: make sure Git has already been built

* po/maint-docs:
  Doc branch: show -vv option and alternative
  Doc clean: add See Also link
  Doc add: link gitignore
  Doc: separate gitignore pattern sources
  Doc: shallow clone deepens _to_ new depth

* jc/ll-merge-binary-ours:
  ll-merge: warn about inability to merge binary files only when we can't
  attr: "binary" attribute should choose built-in "binary" merge driver
  merge: teach -Xours/-Xtheirs to binary ll-merge driver

* db/doc-custom-xmlto:
  Documentation/Makefile: Allow custom XMLTO binary

* 'master' of https://github.com/nafmo/git-l10n-sv:
  l10n: Update Swedish translation (1964t0f0u)

* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update from v1.8.0-rc2-4-g42e55

* translate 3 new messages
* review quotes
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

These were used to keep track of the last commit a release notes
entry was written for, and should have been removed when cutting
the final release.
Signed-off-by: NThomas Ackermann <th.acker@arcor.de>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

We are almost there...
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Fixes a regression in maint-1.7.11 (v1.7.11.7), maint (v1.7.12.1)
and master (v1.8.0-rc0).

* jk/maint-http-half-auth-push:
  http: fix segfault in handle_curl_result

Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>

This po/git.pot update is generated from v1.8.0-rc2-4-g42e55.
Signed-off-by: NJiang Xin <worldhello.net@gmail.com>

* 'master' of git://github.com/vnwildman/git:
  l10n: vi.po: update translation upto cc76011e

* translate all new messages (100%)
* review some others
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>

* maint:
  Fix spelling error in post-receive-email hook

Signed-off-by: NRichard Fearn <richardfearn@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* maint:
  gitweb.cgi: fix "comitter_tz" typo in feed

When we create an http active_request_slot, we can set its
"results" pointer back to local storage. The http code will
fill in the details of how the request went, and we can
access those details even after the slot has been cleaned
up.

Commit 88097030 (http: factor out http error code handling)
switched us from accessing our local results struct directly
to accessing it via the "results" pointer of the slot. That
means we're accessing the slot after it has been marked as
finished, defeating the whole purpose of keeping the results
storage separate.

Most of the time this doesn't matter, as finishing the slot
does not actually clean up the pointer. However, when using
curl's multi interface with the dumb-http revision walker,
we might actually start a new request before handing control
back to the original caller. In that case, we may reuse the
slot, zeroing its results pointer, and leading the original
caller to segfault while looking for its results inside the
slot.

Instead, we need to pass a pointer to our local results
storage to the handle_curl_result function, rather than
relying on the pointer in the slot struct. This matches what
the original code did before the refactoring (which did not
use a separate function, and therefore just accessed the
results struct directly).
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

gitweb's feeds sometimes contained committer timestamps in the wrong timezone
due to a misspelling.
Signed-off-by: NDylan Simon <dylan@dylex.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NJunio C Hamano <gitster@pobox.com>

* rr/git-uri-doc:
  Git url doc: mark ftp/ftps as read-only and deprecate them

* bw/cp-a-is-gnuism:
  tests: "cp -a" is a GNUism

* nd/doc-ignore:
  gitignore.txt: suggestions how to get literal # or ! at the beginning

* jc/doc-long-options:
  gitcli: parse-options lets you omit tail of long options

* maint:
  attr: a note about the order of .gitattributes lookup