mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 08:47:56 +01:00
Code Activity
23543 commits 6 branches 956 tags 491 MiB
Commit graph

23543 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nguyễn Thái Ngọc Duy
cdcef7d546 t1510: setup case #26 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:59 -08:00
Nguyễn Thái Ngọc Duy
468d68226c t1510: setup case #25 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:59 -08:00
Nguyễn Thái Ngọc Duy
73a509ce44 t1510: setup case #24 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:58 -08:00
Nguyễn Thái Ngọc Duy
5362cbfcf3 t1510: setup case #23 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:58 -08:00
Nguyễn Thái Ngọc Duy
fd4e1888ae t1510: setup case #22 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
21b3466f59 t1510: setup case #21 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
4a00884291 t1510: setup case #20 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
09327fd8f7 t1510: setup case #19 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
37eecb3db6 t1510: setup case #18 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
cf83243b0b t1510: setup case #17 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:57 -08:00
Nguyễn Thái Ngọc Duy
af62cc1ba6 t1510: setup case #16 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:56 -08:00
Nguyễn Thái Ngọc Duy
f7c8588322 t1510: setup case #15 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:56 -08:00
Nguyễn Thái Ngọc Duy
69bf2b1604 t1510: setup case #14 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:56 -08:00
Nguyễn Thái Ngọc Duy
dc1c7834b3 t1510: setup case #13 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:56 -08:00
Nguyễn Thái Ngọc Duy
713b3721e2 t1510: setup case #12 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:56 -08:00
Nguyễn Thái Ngọc Duy
3c3b0a0092 t1510: setup case #11 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:55 -08:00
Nguyễn Thái Ngọc Duy
773ec9319e t1510: setup case #10 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:55 -08:00
Nguyễn Thái Ngọc Duy
bc25c1038f t1510: setup case #9 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:55 -08:00
Nguyễn Thái Ngọc Duy
9a5976cd38 t1510: setup case #8 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:55 -08:00
Nguyễn Thái Ngọc Duy
561a7e667f t1510: setup case #7 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:55 -08:00
Nguyễn Thái Ngọc Duy
555b96abde t1510: setup case #6 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:54 -08:00
Nguyễn Thái Ngọc Duy
3f388c1730 t1510: setup case #5 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:54 -08:00
Nguyễn Thái Ngọc Duy
351fa1dc9f t1510: setup case #4 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:54 -08:00
Nguyễn Thái Ngọc Duy
8718ed6125 t1510: setup case #3 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:54 -08:00
Nguyễn Thái Ngọc Duy
7194660205 t1510: setup case #2 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:54 -08:00
Nguyễn Thái Ngọc Duy
8fbee484a8 t1510: setup case #1 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:53 -08:00
Nguyễn Thái Ngọc Duy
fc4045ee3e t1510: setup case #0 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:53 -08:00
Nguyễn Thái Ngọc Duy
03a2b6effa Add t1510 and basic rules that run repo setup 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:53 -08:00
Nguyễn Thái Ngọc Duy
a9ca8a85ef builtins: print setup info if repo is found 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-11-29 13:25:53 -08:00
Junio C Hamano
7ebee44167 Merge branch 'ab/send-email-perl' 
* ab/send-email-perl:
  send-email: extract_valid_address use qr// regexes
  send-email: is_rfc2047_quoted use qr// regexes
  send-email: use Perl idioms in while loop
  send-email: make_message_id use "require" instead of "use"
  send-email: send_message die on $!, not $?
  send-email: use (?:) instead of () if no match variables are needed
  send-email: sanitize_address use qq["foo"], not "\"foo\""
  send-email: sanitize_address use $foo, not "$foo"
  send-email: use \E***\Q instead of \*\*\*
  send-email: cleanup_compose_files doesn't need a prototype
  send-email: unique_email_list doesn't need a prototype
  send-email: file_declares_8bit_cte doesn't need a prototype
  send-email: get_patch_subject doesn't need a prototype
  send-email: use lexical filehandles during sending
  send-email: use lexical filehandles for $compose
  send-email: use lexical filehandle for opendir

Conflicts:
	git-send-email.perl
 2010-10-26 22:02:52 -07:00
Junio C Hamano
8796ff7f3f Merge branch 'sb/send-email-use-to-from-input' 
* sb/send-email-use-to-from-input:
  send-email: Don't leak To: headers between patches
  send-email: Use To: headers in patch files

Conflicts:
	git-send-email.perl
 2010-10-26 22:02:03 -07:00
Junio C Hamano
9b73ce74e6 Merge branch 'ab/require-perl-5.8' 
* 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-10-26 21:57:31 -07:00
Junio C Hamano
329351feeb Merge branch 'kb/merge-recursive-rename-threshold' 
* kb/merge-recursive-rename-threshold:
  diff: add synonyms for -M, -C, -B
  merge-recursive: option to specify rename threshold

Conflicts:
	Documentation/diff-options.txt
	Documentation/merge-strategies.txt
 2010-10-26 21:54:04 -07:00
Junio C Hamano
9b1054d93e Merge branch 'jp/send-email-to-cmd' 
* jp/send-email-to-cmd:
  git-send-email.perl: Add --to-cmd

Conflicts:
	git-send-email.perl
 2010-10-26 21:52:26 -07:00
Junio C Hamano
e6202dfe00 Merge branch 'as/daemon-multi-listen' 
* as/daemon-multi-listen:
  daemon: allow more than one host address given via --listen
  daemon: add helper function named_sock_setup
 2010-10-26 21:50:03 -07:00
Junio C Hamano
0141215c9b Merge branch 'dm/mergetool-vimdiff' 
* dm/mergetool-vimdiff:
  mergetool-lib: make the three-way diff the default for vim/gvim
  mergetool-lib: add a three-way diff view for vim/gvim
  mergetool-lib: combine vimdiff and gvimdiff run blocks
 2010-10-26 21:47:11 -07:00
Junio C Hamano
91e811e0e8 Merge branch 'kf/post-receive-sample-hook' 
* kf/post-receive-sample-hook:
  post-receive-email: ensure sent messages are not empty
 2010-10-26 21:41:18 -07:00
Junio C Hamano
75b17fee72 Merge branch 'jf/merge-ignore-ws' 
* jf/merge-ignore-ws:
  merge-recursive: options to ignore whitespace changes
  merge-recursive --patience
  ll-merge: replace flag argument with options struct
  merge-recursive: expose merge options for builtin merge
 2010-10-26 21:40:54 -07:00
Junio C Hamano
5a3a484d57 Merge branch 'ml/completion-zsh' 
* ml/completion-zsh:
  completion: make compatible with zsh
 2010-10-26 21:39:03 -07:00
Junio C Hamano
a7b60f0055 Merge branch 'po/sendemail' 
* po/sendemail:
  New send-email option smtpserveroption.
  Remove @smtp_host_parts variable as not used.
  Minor indentation fix.
 2010-10-26 21:37:54 -07:00
Junio C Hamano
acbaf54f30 Merge branch 'en/tree-walk-optim' 
* en/tree-walk-optim:
  diff_tree(): Skip skip_uninteresting() when all remaining paths interesting
  tree_entry_interesting(): Make return value more specific
  tree-walk: Correct bitrotted comment about tree_entry()
  Document pre-condition for tree_entry_interesting
 2010-10-26 21:37:49 -07:00
Junio C Hamano
d7806967bd Merge branch 'maint' 
* maint:
  Fix copy-pasted comments related to tree diff handling.
 2010-10-26 15:04:05 -07:00
Yann Dirson
c3fced6498 Fix copy-pasted comments related to tree diff handling. 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-25 00:21:56 -07:00
Junio C Hamano
d4c4369752 Sync with 1.7.3.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-21 17:16:10 -07:00
Junio C Hamano
8a90438506 Git 1.7.3.2 2010-10-21 17:14:32 -07:00
Junio C Hamano
f7bff60de9 Merge branch 'sn/doc-opt-notation' into maint 
* sn/doc-opt-notation:
  Fix {update,checkout}-index usage strings
  Put a space between `<' and argument in pack-objects usage string
  Remove stray quotes in --pretty and --format documentation
  Use parentheses and `...' where appropriate
  Fix odd markup in --diff-filter documentation
  Use angles for placeholders consistently
 2010-10-21 16:26:42 -07:00
Junio C Hamano
75a2f30167 Merge branch 'mg/fix-build-remote-helpers' into maint 
* mg/fix-build-remote-helpers:
  remote-helpers: build in platform independent directory
 2010-10-21 16:26:38 -07:00
Thomas Rast
1bb28d87e1 {cvs,svn}import: use the new 'git read-tree --empty' 
Since fb1bb96 (read-tree: deprecate syntax without tree-ish args,
2010-09-10) not passing --empty caused a spurious warning that was
shown to the user.

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-19 14:15:59 -07:00
Junio C Hamano
c7deb8dac1 Merge branch 'maint' 
* maint:
  t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To'
  Clarify and extend the "git diff" format documentation
  git-show-ref.txt: clarify the pattern matching
  documentation: git-config minor cleanups
  Update test script annotate-tests.sh to handle missing/extra authors
 2010-10-19 14:15:51 -07:00
Antonio Ospite
5b57413cb3 t/t9001-send-email.sh: fix stderr redirection in 'Invalid In-Reply-To' 
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-10-19 14:15:30 -07:00