undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,410 Commits 1 Branch 0 Tags 217 MiB
cac42b266a
Commit Graph

21410 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
cac42b266a builtin/merge: make checkout_fast_forward() non static 
and also export it in "cache.h".

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-06 23:58:46 -08:00
Junio C Hamano
8b74d75cd2 parse-options: add parse_options_concat() to concat options 
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-06 23:58:33 -08:00
Junio C Hamano
be2fb164ec Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.0.2
  Remove extra '-' from git-am(1)
 2010-03-04 22:39:54 -08:00
Junio C Hamano
3609ad8ec2 Update draft release notes to 1.7.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-04 22:39:38 -08:00
Junio C Hamano
7d181222ea Merge branch 'jn/gitweb-config-error-die' into maint 
* jn/gitweb-config-error-die:
  gitweb: Die if there are parsing errors in config file
 2010-03-04 22:27:12 -08:00
Junio C Hamano
6914c661c3 Merge branch 'jn/maint-fix-pager' into maint 
* jn/maint-fix-pager:
  tests: Fix race condition in t7006-pager
  t7006-pager: if stdout is not a terminal, make a new one
  tests: Add tests for automatic use of pager
  am: Fix launching of pager
  git svn: Fix launching of pager
  git.1: Clarify the behavior of the --paginate option
  Make 'git var GIT_PAGER' always print the configured pager
  Fix 'git var' usage synopsis
 2010-03-04 22:27:04 -08:00
Junio C Hamano
712d352577 Merge branch 'tr/maint-cherry-pick-list' into maint 
* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty
 2010-03-04 22:26:44 -08:00
Junio C Hamano
8cc3709df0 Merge branch 'ld/maint-diff-quiet-w' into maint 
* ld/maint-diff-quiet-w:
  git-diff: add a test for git diff --quiet -w
  git diff --quiet -w: check and report the status
 2010-03-04 22:26:39 -08:00
Junio C Hamano
868cfe0923 Merge branch 'rs/optim-text-wrap' into maint 
* rs/optim-text-wrap:
  utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
  utf8.c: remove strbuf_write()
  utf8.c: remove print_spaces()
  utf8.c: remove print_wrapped_text()
 2010-03-04 22:26:33 -08:00
Junio C Hamano
780fc9a0a6 Merge branch 'dp/read-not-mmap-small-loose-object' into maint 
* dp/read-not-mmap-small-loose-object:
  hash-object: don't use mmap() for small files
 2010-03-04 22:26:17 -08:00
Junio C Hamano
035aa7678b Merge branch 'np/compress-loose-object-memsave' into maint 
* np/compress-loose-object-memsave:
  sha1_file: be paranoid when creating loose objects
  sha1_file: don't malloc the whole compressed result when writing out objects
 2010-03-04 22:26:05 -08:00
Junio C Hamano
6c4ee2244a Merge branch 'jc/maint-status-preload' into maint 
* jc/maint-status-preload:
  status: preload index to optimize lstat(2) calls
 2010-03-04 22:25:45 -08:00
Junio C Hamano
801bad3ba4 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint 
* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
 2010-03-04 22:25:37 -08:00
Junio C Hamano
ce5044df2a Merge branch 'cc/maint-bisect-paths' into maint 
* cc/maint-bisect-paths:
  bisect: error out when passing bad path parameters
 2010-03-04 22:25:23 -08:00
Junio C Hamano
507665e4f4 Merge branch 'maint-1.6.6' into maint 
* maint-1.6.6:
  Remove extra '-' from git-am(1)
 2010-03-04 22:24:25 -08:00
Junio C Hamano
e8a285e553 Merge branch 'maint-1.6.5' into maint-1.6.6 
* maint-1.6.5:
  Remove extra '-' from git-am(1)
 2010-03-04 22:24:19 -08:00
Michal Sojka
8024d5961b Remove extra '-' from git-am(1) 
Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-04 22:02:44 -08:00
Michael J Gruber
3acae29e81 t9119-git-svn-info.sh: test with svn 1.6.* as well 
All tests in t9119 were disabled for subversion versions other than
1.[45].*. Make the test script run with subversion 1.[456].*.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
 2010-03-04 01:45:15 -08:00
Michael J Gruber
b91a8a3ee1 git-svn: req_svn when needed 
The delayed loading of SVN missed a place where SVN::Core is used. Make
sure to load the package before trying to use it.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Acked-by: Eric Wong <normalperson@yhbt.net>
 2010-03-04 01:45:15 -08:00
Junio C Hamano
6d84bcb5de Merge branch 'maint' 
* maint:
  Start preparing for 1.7.0.2

Conflicts:
	RelNotes
 2010-03-03 14:56:13 -08:00
Junio C Hamano
66a5eeffff Merge branch 'jh/maint-submodule-status-in-void' (early part) 
* 'jh/maint-submodule-status-in-void' (early part):
  submodule summary: do not shift a non-existent positional variable
 2010-03-03 14:50:22 -08:00
Jeff King
caa9c3cabe submodule summary: do not shift a non-existent positional variable 
When "git submodule summary" is run without any argument, we default to
compare the state of index with the HEAD, but tried to shift out $1 that
does not exist (and worse yet, we didn't use it).

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-03 14:33:21 -08:00
Junio C Hamano
511da22ecf Start preparing for 1.7.0.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-02 23:11:36 -08:00
Junio C Hamano
b46946aae7 Merge branch 'tc/maint-transport-ls-remote-with-void' into maint 
* tc/maint-transport-ls-remote-with-void:
  transport: add got_remote_refs flag
 2010-03-02 22:55:22 -08:00
Junio C Hamano
be8198b236 Merge branch 'hm/maint-imap-send-crlf' into maint 
* hm/maint-imap-send-crlf:
  git-imap-send: Convert LF to CRLF before storing patch to draft box
 2010-03-02 22:55:03 -08:00
Junio C Hamano
a886ba2801 Merge branch 'sp/maint-push-sideband' into maint 
* sp/maint-push-sideband:
  receive-pack: Send internal errors over side-band #2
  t5401: Use a bare repository for the remote peer
  receive-pack: Send hook output over side band #2
  receive-pack: Wrap status reports inside side-band-64k
  receive-pack: Refactor how capabilities are shown to the client
  send-pack: demultiplex a sideband stream with status data
  run-command: support custom fd-set in async
  run-command: Allow stderr to be a caller supplied pipe

Conflicts:
	builtin-receive-pack.c
	run-command.c
	t/t5401-update-hooks.sh
 2010-03-02 22:54:50 -08:00
Junio C Hamano
a625740aae Merge branch 'jc/maint-fix-test-perm' into maint 
* jc/maint-fix-test-perm:
  lib-patch-mode.sh: Fix permission
  t6000lib: Fix permission
 2010-03-02 22:38:02 -08:00
Junio C Hamano
f54555ca29 Merge branch 'np/fast-import-idx-v2' into maint 
* np/fast-import-idx-v2:
  fast-import: use the diff_delta() max_delta_size argument
  fast-import: honor pack.indexversion and pack.packsizelimit config vars
  fast-import: make default pack size unlimited
  fast-import: use write_idx_file() instead of custom code
  fast-import: use sha1write() for pack data
  fast-import: start using struct pack_idx_entry
 2010-03-02 22:28:49 -08:00
Junio C Hamano
a75bab51ae Merge branch 'maint' 
* maint:
  gitweb: Fix project-specific feature override behavior
  gitweb multiple project roots documentation
 2010-03-02 12:44:16 -08:00
Junio C Hamano
52ebb06f14 Merge branch 'jn/maint-fix-pager' 
* jn/maint-fix-pager:
  tests: Fix race condition in t7006-pager
  t7006-pager: if stdout is not a terminal, make a new one
  tests: Add tests for automatic use of pager
  am: Fix launching of pager
  git svn: Fix launching of pager
  git.1: Clarify the behavior of the --paginate option
  Make 'git var GIT_PAGER' always print the configured pager
  Fix 'git var' usage synopsis
 2010-03-02 12:44:11 -08:00
Junio C Hamano
77b30bcecd Merge branch 'ml/encode-header-refactor' 
* ml/encode-header-refactor:
  move encode_in_pack_object_header() to a better place
  refactor duplicated encode_header in pack-objects and fast-import
 2010-03-02 12:44:11 -08:00
Junio C Hamano
ca97d26cc6 Merge branch 'jn/gitweb-config-error-die' 
* jn/gitweb-config-error-die:
  gitweb: Die if there are parsing errors in config file
 2010-03-02 12:44:11 -08:00
Junio C Hamano
e4b89317cd Merge branch 'jc/for-each-ref' 
* jc/for-each-ref:
  for-each-ref --format='%(flag)'
  for-each-ref --format='%(symref) %(symref:short)'
  builtin-for-each-ref.c: check if we need to peel onion while parsing the format
  builtin-for-each-ref.c: comment fixes
 2010-03-02 12:44:10 -08:00
Junio C Hamano
36420805a7 Merge branch 'ld/maint-diff-quiet-w' 
* ld/maint-diff-quiet-w:
  git-diff: add a test for git diff --quiet -w
  git diff --quiet -w: check and report the status
 2010-03-02 12:44:10 -08:00
Junio C Hamano
68a4741484 Merge branch 'tr/maint-cherry-pick-list' 
* tr/maint-cherry-pick-list:
  cherry_pick_list: quit early if one side is empty
 2010-03-02 12:44:10 -08:00
Junio C Hamano
32ae5b3425 Merge branch 'rs/optim-text-wrap' 
* rs/optim-text-wrap:
  utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()
  utf8.c: remove strbuf_write()
  utf8.c: remove print_spaces()
  utf8.c: remove print_wrapped_text()
 2010-03-02 12:44:10 -08:00
Junio C Hamano
bd282f58ad Merge branch 'ml/send-pack-transport-refactor' 
* ml/send-pack-transport-refactor:
  refactor duplicated code in builtin-send-pack.c and transport.c
 2010-03-02 12:44:09 -08:00
Junio C Hamano
d5f61ce157 Merge branch 'ml/fill-mm-refactor' 
* ml/fill-mm-refactor:
  refactor duplicated fill_mm() in checkout and merge-recursive
 2010-03-02 12:44:09 -08:00
Junio C Hamano
a0626bcc66 Merge branch 'ml/connect-refactor' 
* ml/connect-refactor:
  connect.c: move duplicated code to a new function 'get_host_and_port'
 2010-03-02 12:44:09 -08:00
Junio C Hamano
34c014d13e Merge branch 'np/compress-loose-object-memsave' 
* np/compress-loose-object-memsave:
  sha1_file: be paranoid when creating loose objects
  sha1_file: don't malloc the whole compressed result when writing out objects
 2010-03-02 12:44:09 -08:00
Junio C Hamano
7237f97181 Merge branch 'dp/read-not-mmap-small-loose-object' 
* dp/read-not-mmap-small-loose-object:
  hash-object: don't use mmap() for small files
 2010-03-02 12:44:08 -08:00
Junio C Hamano
a026d5318c Merge branch 'jn/makedepend' 
* jn/makedepend:
  Makefile: clarify definition of TEST_OBJS
  Makefile: always remove .depend directories on 'make clean'
  Makefile: tuck away generated makefile fragments in .depend
  Teach Makefile to check header dependencies
  Makefile: list standalone program object files in PROGRAM_OBJS
  Makefile: lazily compute header dependencies
  Makefile: list generated object files in OBJECTS
  Makefile: disable default implicit rules
  Makefile: rearrange dependency rules
  Makefile: transport.o depends on branch.h now
  Makefile: drop dependency on $(wildcard */*.h)
  Makefile: clean up http-walker.o dependency rules
  Makefile: remove wt-status.h from LIB_H
  Makefile: make sure test helpers are rebuilt when headers change
  Makefile: add missing header file dependencies

Conflicts:
	Makefile
 2010-03-02 12:44:08 -08:00
Junio C Hamano
c673764dde Merge branch 'jc/maint-status-preload' 
* jc/maint-status-preload:
  status: preload index to optimize lstat(2) calls
 2010-03-02 12:44:07 -08:00
Junio C Hamano
8acd141bb5 Merge branch 'gf/maint-sh-setup-nongit-ok' 
* gf/maint-sh-setup-nongit-ok:
  require_work_tree broken with NONGIT_OK
 2010-03-02 12:44:07 -08:00
Junio C Hamano
490b8ad76f Merge branch 'jh/maint-submodule-status-in-void' 
* jh/maint-submodule-status-in-void:
  submodule summary: Don't barf when invoked in an empty repo
 2010-03-02 12:44:07 -08:00
Junio C Hamano
39914cb506 Merge branch 'hm/imap-send-cram-md5' 
* hm/imap-send-cram-md5:
  imap-send: support CRAM-MD5 authentication
 2010-03-02 12:44:06 -08:00
Junio C Hamano
c06951894a Merge branch 'ml/color-when' 
* ml/color-when:
  Add an optional argument for --color options
 2010-03-02 12:44:06 -08:00
Junio C Hamano
6954ef2063 Merge branch 'ac/cvsimport-revision-mapping' 
* ac/cvsimport-revision-mapping:
  cvsimport: new -R option: generate .git/cvs-revisions mapping
 2010-03-02 12:44:06 -08:00
Junio C Hamano
6b45b8c088 Merge branch 'jc/grep-author-all-match-implicit' 
* jc/grep-author-all-match-implicit:
  "log --author=me --grep=it" should find intersection, not union
 2010-03-02 12:44:06 -08:00
Frank Li
82cd8358e8 fallback SSH_ASKPASS when GIT_ASKPASS not set 
If GIT_ASKPASS is not set and SSH_ASKPASS set, GIT_ASKPASS will
use SSH_ASKPASS.

Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-03-02 12:15:41 -08:00