global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-17 20:20:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,184 Commits 6 Branches 1,000 Tags
d81e12d172ea32dedfb38c99e852405d3fa9e681
Commit Graph

24184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
d81e12d172 Merge branch 'master' into next 
* master:
  Relnotes: remove items fixed on 'maint'
  Prepare for 1.7.3.4
  thread-utils.h: simplify the inclusion
  Makefile: transport-helper uses thread-utils.h
  Add --force to git-send-email documentation
 2010-12-10 16:40:09 -08:00
Junio C Hamano
4443091d96 Relnotes: remove items fixed on 'maint' 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:40:00 -08:00
Junio C Hamano
271c2aa6ee Merge branch 'maint' 2010-12-10 16:36:53 -08:00
Junio C Hamano
c6d059bbcc Prepare for 1.7.3.4 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 16:35:00 -08:00
Junio C Hamano
7bf040c5bf Merge branch 'jk/maint-decorate-01-bool' into maint 
* jk/maint-decorate-01-bool:
  log.decorate: accept 0/1 bool values
 2010-12-10 16:13:14 -08:00
Junio C Hamano
aa78384156 Merge branch 'mg/maint-tag-rfc1991' into maint 
* mg/maint-tag-rfc1991:
  tag: recognize rfc1991 signatures
  tag: factor out sig detection for tag display
  tag: factor out sig detection for body edits
  verify-tag: factor out signature detection
  t/t7004-tag: test handling of rfc1991 signatures
 2010-12-10 16:13:03 -08:00
Junio C Hamano
af41867169 Merge branch 'ks/maint-getenv-fix' into maint 
* ks/maint-getenv-fix:
  setup: make sure git_dir path is in a permanent buffer, getenv(3) case
 2010-12-10 16:12:51 -08:00
Junio C Hamano
b361888dd5 thread-utils.h: simplify the inclusion 
All files that include this header file use the same four line
incantation:

    #ifndef NO_PTHREADS
    #include <pthread.h>
    #include "thread-utils.h"
    #endif

Move the responsibility for that gymnastics to the header file from the
files that include it.  This approach makes it easier to later declare new
services that are related to threading in thread-utils.h and have them
available to all the threading code.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 12:58:06 -08:00
Jonathan Nieder
e4117b1fe8 Makefile: transport-helper uses thread-utils.h 
transport-helper.o gained a dependency on thread-utils.h in
7851b1e (remote-fd/ext: finishing touches after code review,
2010-11-17).

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 12:57:59 -08:00
Alejandro R. Sedeño
1a3e302a25 Add --force to git-send-email documentation 
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-10 10:50:32 -08:00
Junio C Hamano
2d0123ccb9 Merge branch 'master' into next 
* master:
  Documentation/git.txt: update list of maintenance releases
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set
 2010-12-09 16:51:08 -08:00
Junio C Hamano
2f76a26ee7 Merge git://git.bogomips.org/git-svn 
* git://git.bogomips.org/git-svn:
  t9143: do not fail when unhandled.log.gz is not created
  git-svn: allow the mergeinfo property to be set
 2010-12-09 16:03:41 -08:00
Junio C Hamano
ed94cc768c Documentation/git.txt: update list of maintenance releases 
Recently we have made 1.7.3.3, 1.7.2.4, 1.7.1.3 and 1.7.0.8.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-09 15:52:12 -08:00
Torsten Bögershausen
7d79cb6ad5 t9143: do not fail when unhandled.log.gz is not created 
Do not depend on internal implementation details of svn,
which right now uses perl to create a .gz file.
So this test case will even work in the future,
when svn changes its implementation.

Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Acked-by: Eric Wong <normalperson@yhbt.net>
 2010-12-10 04:18:03 +08:00
Steven Walter
6abd9332f9 git-svn: allow the mergeinfo property to be set 
As a first step towards preserving merges across dcommit, we need a
mechanism to update the svn:mergeinfo property.

[ew: fixed bashism and style issues in test case]

Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
 2010-12-10 04:09:48 +08:00
Junio C Hamano
d3b060c6ad Merge branch 'master' into next 
* master:
  contrib/hooks/post-receive-email: fix return values from prep_for_email
 2010-12-09 10:49:05 -08:00
Junio C Hamano
9b5a272e72 Merge branch 'maint' 
* maint:
  contrib/hooks/post-receive-email: fix return values from prep_for_email
 2010-12-09 10:45:53 -08:00
Junio C Hamano
4b5f94cdde Merge branch 'jn/ignore-doc' into maint 
* jn/ignore-doc:
  Documentation: point to related commands from gitignore
  Documentation: split gitignore page into sections
 2010-12-09 10:38:16 -08:00
Junio C Hamano
6aa6a92fb6 Merge branch 'jn/cherry-pick-refresh-index' into maint 
* jn/cherry-pick-refresh-index:
  cherry-pick/revert: transparently refresh index
 2010-12-09 10:36:51 -08:00
Junio C Hamano
11cf80dc70 Merge branch 'jl/add-p-reverse-message' into maint 
* jl/add-p-reverse-message:
  Correct help blurb in checkout -p and friends
 2010-12-09 10:36:47 -08:00
Junio C Hamano
8577def6fc Merge branch 'np/diff-in-corrupt-repository' into maint 
* np/diff-in-corrupt-repository:
  diff: don't presume empty file when corresponding object is missing
 2010-12-09 10:36:39 -08:00
Junio C Hamano
a59c87265b Merge branch 'fc/apply-p2-get-header-name' into maint 
* fc/apply-p2-get-header-name:
  test: git-apply -p2 rename/chmod only
  Fix git-apply with -p greater than 1
 2010-12-09 10:36:36 -08:00
Junio C Hamano
5605685a71 Merge branch 'np/pack-broken-boundary' into maint 
* np/pack-broken-boundary:
  make pack-objects a bit more resilient to repo corruption
 2010-12-09 10:36:23 -08:00
Junio C Hamano
ded4dfd519 Merge branch 'ak/apply-non-git-epoch' into maint 
* ak/apply-non-git-epoch:
  apply: handle patches with funny filename and colon in timezone
  apply: Recognize epoch timestamps with : in the timezone
 2010-12-09 10:36:16 -08:00
Junio C Hamano
ae0a37cd6b Merge branch 'cm/diff-check-at-eol' into maint 
* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF
 2010-12-09 10:36:10 -08:00
Junio C Hamano
d3334d9c44 Merge branch 'tc/smart-http-post-redirect' into maint 
* tc/smart-http-post-redirect:
  smart-http: Don't change POST to GET when following redirect
 2010-12-09 10:36:04 -08:00
Junio C Hamano
fa8f1ca2a4 Merge branch 'ab/require-perl-5.8' into maint 
* ab/require-perl-5.8:
  perl: use "use warnings" instead of -w
  perl: bump the required Perl version to 5.8 from 5.6.[21]
 2010-12-09 10:35:21 -08:00
Alan Raison
8828aa3418 contrib/hooks/post-receive-email: fix return values from prep_for_email 
The function was returning 0 for failure and 1 for success which was
breaking the logic in the main loop.  It now also returns in all
cases, rather than exiting.

Signed-off-by: Alan Raison <alan@theraisons.me.uk>
Acked-by: Kevin P. Fleming <kpfleming@digium.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-09 09:34:11 -08:00
Junio C Hamano
98beb7cc57 Merge branch 'jn/maint-svn-fe' into next 
* jn/maint-svn-fe:
  t9010 fails when no svn is available
 2010-12-09 09:26:43 -08:00
Junio C Hamano
8e9d453ce7 t9010 fails when no svn is available 
Running test t9010 without svn currently errors out for no good reason.

The test uses "svnadmin" without checking if svn is available.  This was a
regression introduced by b0ad24b (t9010 (svn-fe): Eliminate dependency on
svn perl bindings, 2010-10-10) when it stopped including ./lib-git-svn.sh
that had the safety.

This should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-09 09:26:07 -08:00
Junio C Hamano
e348a8704e Merge branch 'jc/maint-no-openssl-build-fix' into next 
* jc/maint-no-openssl-build-fix:
  Do not link with -lcrypto under NO_OPENSSL
 2010-12-08 15:15:30 -08:00
Junio C Hamano
5b02b9baf7 Do not link with -lcrypto under NO_OPENSSL 
With 401857c (imap-send: link against libcrypto for HMAC and others,
2010-11-24) we started linking imap-send unconditionally with -lcrypto by
mistake; disable this when we are building under NO_OPENSSL.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-12-08 14:54:13 -08:00
Junio C Hamano
f8216945ae Merge branch 'jc/maint-svn-info-test-fix' into next 
* jc/maint-svn-info-test-fix:
  t9119: do not compare "Text Last Updated" line from "svn info"
 2010-12-08 12:25:29 -08:00
Junio C Hamano
33423f331e Merge branch 'jn/submodule-b-current' into next 
* jn/submodule-b-current:
  git submodule: Remove now obsolete tests before cloning a repo
  git submodule -b ... of current HEAD fails
 2010-12-08 12:25:29 -08:00
Junio C Hamano
02918583ee Merge branch 'aa/status-hilite-branch' into next 
* aa/status-hilite-branch:
  status: show branchname with a configurable color
 2010-12-08 12:25:29 -08:00
Junio C Hamano
c92752ec50 Merge branch 'ef/help-cmd-prefix' into next 
* ef/help-cmd-prefix:
  help: always suggest common-cmds if prefix of cmd
 2010-12-08 12:25:29 -08:00
Junio C Hamano
a42f0b3dea Merge branch 'jn/fast-import-blob-access' into next 
* jn/fast-import-blob-access:
  t9300: remove unnecessary use of /dev/stdin
  fast-import: Allow cat-blob requests at arbitrary points in stream
  fast-import: let importers retrieve blobs
  fast-import: clarify documentation of "feature" command
  fast-import: stricter parsing of integer options

Conflicts:
	fast-import.c
 2010-12-08 12:25:29 -08:00
Junio C Hamano
44be9e5475 Merge branch 'jn/gitweb-per-request-config' into next 
* jn/gitweb-per-request-config:
  gitweb: document $per_request_config better
  gitweb: selectable configurations that change with each request
 2010-12-08 12:25:29 -08:00
Junio C Hamano
97d4912074 Merge branch 'mz/maint-rebase-stat-config' into next 
* mz/maint-rebase-stat-config:
  rebase: only show stat if configured to true
 2010-12-08 12:25:28 -08:00
Junio C Hamano
99c1762498 Merge branch 'mz/pull-rebase-rebased' into next 
* mz/pull-rebase-rebased:
  Use reflog in 'pull --rebase . foo'
 2010-12-08 12:25:28 -08:00
Junio C Hamano
1869996999 Merge branch 'nd/maint-hide-checkout-index-from-error' into next 
* nd/maint-hide-checkout-index-from-error:
  entry.c: remove "checkout-index" from error messages
 2010-12-08 12:25:28 -08:00
Junio C Hamano
cff4009987 Merge branch 'gb/web--browse' into next 
* gb/web--browse:
  web--browse: better support for chromium
  web--browse: support opera, seamonkey and elinks
  web--browse: split valid_tool list
  web--browse: coding style
 2010-12-08 12:25:28 -08:00
Junio C Hamano
211bf89275 Merge branch 'ja/maint-pull-rebase-doc' into next 
* ja/maint-pull-rebase-doc:
  git-pull.txt: Mention branch.autosetuprebase
 2010-12-08 12:25:28 -08:00
Junio C Hamano
32573659bd Merge branch 'js/configurable-tab' into next 
* js/configurable-tab:
  Make the tab width used for whitespace checks configurable
 2010-12-08 12:25:28 -08:00
Junio C Hamano
02aedd5860 Merge branch 'js/maint-apply-tab-in-indent-fix' into next 
* js/maint-apply-tab-in-indent-fix:
  apply --whitespace=fix: fix tab-in-indent
 2010-12-08 12:25:27 -08:00
Junio C Hamano
1a7169d7fa Merge branch 'ef/win32-dirent' into next 
* ef/win32-dirent:
  win32: use our own dirent.h
  msvc: opendir: handle paths ending with a slash
  win32: dirent: handle errors
  msvc: opendir: do not start the search
  msvc: opendir: allocate enough memory
  msvc: opendir: fix malloc-failure

Conflicts:
	Makefile
 2010-12-08 12:25:27 -08:00
Junio C Hamano
72ffafe934 Merge branch 'jk/asciidoc-update' into next 
* jk/asciidoc-update:
  docs: default to more modern toolset
 2010-12-08 12:25:27 -08:00
Junio C Hamano
f5ca80a617 Merge branch 'jk/maint-reflog-bottom' into next 
* jk/maint-reflog-bottom:
  reflogs: clear flags properly in corner case
 2010-12-08 12:25:26 -08:00
Junio C Hamano
5d29c08eed Merge branch 'jn/maint-fast-import-object-reuse' into next 
* jn/maint-fast-import-object-reuse:
  fast-import: insert new object entries at start of hash bucket
 2010-12-08 12:25:25 -08:00
Junio C Hamano
f5383960bf Merge branch 'jn/fast-import-ondemand-checkpoint' into next 
* jn/fast-import-ondemand-checkpoint:
  fast-import: treat SIGUSR1 as a request to access objects early
 2010-12-08 12:25:25 -08:00