admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,447 Commits 1 Branch 0 Tags
262657dce61b417d712a7f4cd85ff8ff4c6ec3a4
Commit Graph

22447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
262657dce6 Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.1.1
  tests: remove unnecessary '^' from 'expr' regular expression

Conflicts:
	diff.c
 2010-06-22 09:35:36 -07:00
Junio C Hamano
a4c24549ac Update draft release notes to 1.7.1.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-06-22 09:33:03 -07:00
Junio C Hamano
b2ebbd8f13 Merge branch 'ic/maint-rebase-i-abort' into maint 
* ic/maint-rebase-i-abort:
  rebase -i: Abort cleanly if new base cannot be checked out
 2010-06-22 09:31:48 -07:00
Junio C Hamano
81b43b54b2 Merge branch 'cc/maint-commit-reflog-msg' into maint 
* cc/maint-commit-reflog-msg:
  commit: use value of GIT_REFLOG_ACTION env variable as reflog message
 2010-06-22 09:31:48 -07:00
Junio C Hamano
abd3fd358b Merge branch 'jk/maint-advice-empty-amend' into maint 
* jk/maint-advice-empty-amend:
  commit: give advice on empty amend
 2010-06-22 09:31:48 -07:00
Junio C Hamano
b2a6095308 Merge branch 'tc/commit-abbrev-fix' into maint 
* tc/commit-abbrev-fix:
  commit::print_summary(): don't use format_commit_message()
  t7502-commit: add summary output tests for empty and merge commits
  t7502-commit: add tests for summary output
 2010-06-22 09:31:47 -07:00
Junio C Hamano
a7e664fc2a Merge branch 'jn/document-rebase-i-p-limitation' into maint 
* jn/document-rebase-i-p-limitation:
  rebase -i -p: document shortcomings
 2010-06-22 09:31:47 -07:00
Junio C Hamano
12575b78fb Merge branch 'jn/checkout-doc' into maint 
* jn/checkout-doc:
  Documentation/checkout: clarify description
  Documentation/checkout: clarify description
 2010-06-22 09:31:47 -07:00
Junio C Hamano
3c656899cd Merge branch 'cc/maint-diff-CC-binary' into maint 
* cc/maint-diff-CC-binary:
  diff: fix "git show -C -C" output when renaming a binary file

Conflicts:
	diff.c
 2010-06-22 09:27:07 -07:00
Junio C Hamano
a8c4d925ca Merge branch 'jc/t9129-any-utf8' into maint 
* jc/t9129-any-utf8:
  t9129: fix UTF-8 locale detection
 2010-06-22 08:31:53 -07:00
Junio C Hamano
4b2405ce19 Merge branch 'cb/ls-files-cdup' into maint 
* cb/ls-files-cdup:
  ls-files: allow relative pathspec
  quote.c: separate quoting and relative path generation
 2010-06-22 08:31:46 -07:00
Junio C Hamano
e3ed7f721c Merge branch 'tc/merge-m-log' into maint 
* tc/merge-m-log:
  merge: --log appends shortlog to message if specified
  fmt-merge-msg: add function to append shortlog only
  fmt-merge-msg: refactor merge title formatting
  fmt-merge-msg: minor refactor of fmt_merge_msg()
  merge: rename variable
  merge: update comment
  t7604-merge-custom-message: show that --log doesn't append to -m
  t7604-merge-custom-message: shift expected output creation
 2010-06-22 08:31:25 -07:00
Junio C Hamano
958ff4a597 Merge branch 'ph/clone-message-reword' into maint 
* ph/clone-message-reword:
  clone: reword messages to match the end-user perception
 2010-06-22 08:31:20 -07:00
Junio C Hamano
0d2416e060 Merge branch 'jn/maint-amend-missing-name' into maint 
* jn/maint-amend-missing-name:
  commit --amend: cope with missing display name
 2010-06-22 08:30:44 -07:00
Junio C Hamano
21919d396a Merge branch 'pc/remove-warn' into maint 
* pc/remove-warn:
  Remove a redundant errno test in a usage of remove_path
  Introduce remove_or_warn function
  Implement the rmdir_or_warn function
  Generalise the unlink_or_warn function
 2010-06-22 08:30:38 -07:00
Junio C Hamano
e0ae1e6f4d tests: remove unnecessary '^' from 'expr' regular expression 
As Brandon noticed, a regular expression match given to 'expr' is already
anchored at the beginning.  Some versions of expr even complain about this.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-06-21 11:18:54 -07:00
Junio C Hamano
6df2ffaeef Merge branch 'js/maint-receive-pack-symref-alias' 
* js/maint-receive-pack-symref-alias:
 2010-06-21 06:02:50 -07:00
Junio C Hamano
6cd52edbbd Merge branch 'cc/maint-commit-reflog-msg' 
* cc/maint-commit-reflog-msg:
  commit: use value of GIT_REFLOG_ACTION env variable as reflog message
 2010-06-21 06:02:50 -07:00
Junio C Hamano
9cb16a92d7 Merge branch 'ic/maint-rebase-i-abort' 
* ic/maint-rebase-i-abort:
  rebase -i: Abort cleanly if new base cannot be checked out
 2010-06-21 06:02:50 -07:00
Junio C Hamano
542ed78232 Merge branch 'jk/maint-advice-empty-amend' 
* jk/maint-advice-empty-amend:
  commit: give advice on empty amend
 2010-06-21 06:02:49 -07:00
Junio C Hamano
d5cff17eda Merge branch 'eb/core-eol' 
* eb/core-eol:
  Add "core.eol" config variable
  Rename the "crlf" attribute "text"
  Add per-repository eol normalization
  Add tests for per-repository eol normalization

Conflicts:
	Documentation/config.txt
	Makefile
 2010-06-21 06:02:49 -07:00
Junio C Hamano
d249515f29 Merge branch 'fg/autocrlf' 
* fg/autocrlf:
  autocrlf: Make it work also for un-normalized repositories
 2010-06-21 06:02:47 -07:00
Junio C Hamano
1623191be4 Merge branch 'sm/branch-broken-ref' 
* sm/branch-broken-ref:
  branch: don't fail listing branches if one of the commits wasn't found
  branch: exit status now reflects if branch listing finds an error
 2010-06-21 06:02:47 -07:00
Junio C Hamano
8718e87508 Merge branch 'rr/parse-date-refactor' 
* rr/parse-date-refactor:
  Refactor parse_date for approxidate functions
 2010-06-21 06:02:47 -07:00
Junio C Hamano
d4f8f74bc6 Merge branch 'jn/document-rebase-i-p-limitation' 
* jn/document-rebase-i-p-limitation:
  rebase -i -p: document shortcomings
 2010-06-21 06:02:47 -07:00
Junio C Hamano
1a5296cb92 Merge branch 'tc/commit-abbrev-fix' 
* tc/commit-abbrev-fix:
  commit::print_summary(): don't use format_commit_message()
  t7502-commit: add summary output tests for empty and merge commits
  t7502-commit: add tests for summary output
 2010-06-21 06:02:46 -07:00
Junio C Hamano
cecff3a45b Merge branch 'tr/receive-pack-aliased-update-fix' 
* tr/receive-pack-aliased-update-fix:
  check_aliased_update: strcpy() instead of strcat() to copy
 2010-06-21 06:02:46 -07:00
Junio C Hamano
632d3f4b5b Merge branch 'gs/usage-to-stdout' 
* gs/usage-to-stdout:
  parseopt: wrap rev-parse --parseopt usage for eval consumption
  print the usage string on stdout instead of stderr

Conflicts:
	parse-options.h
 2010-06-21 06:02:45 -07:00
Junio C Hamano
762655010d Merge branch 'js/async-thread' 
* js/async-thread:
  fast-import: die_nicely() back to vsnprintf (reverts part of ebaa79f)
  Enable threaded async procedures whenever pthreads is available
  Dying in an async procedure should only exit the thread, not the process.
  Reimplement async procedures using pthreads
  Windows: more pthreads functions
  Fix signature of fcntl() compatibility dummy
  Make report() from usage.c public as vreportf() and use it.
  Modernize t5530-upload-pack-error.

Conflicts:
	http-backend.c
 2010-06-21 06:02:45 -07:00
Junio C Hamano
8d676d85f7 Merge branch 'gv/portable' 
* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
  build: propagate $DIFF to scripts
  Makefile: Tru64 portability fix
  Makefile: HP-UX 10.20 portability fixes
  Makefile: HPUX11 portability fixes
  Makefile: SunOS 5.6 portability fix
  inline declaration does not work on AIX
  Allow disabling "inline"
  Some platforms lack socklen_t type
  Make NO_{INET_NTOP,INET_PTON} configured independently
  Makefile: some platforms do not have hstrerror anywhere
  git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
  test_cmp: do not use "diff -u" on platforms that lack one
  fixup: do not unconditionally disable "diff -u"
  tests: use "test_cmp", not "diff", when verifying the result
  Do not use "diff" found on PATH while building and installing
  enums: omit trailing comma for portability
  Makefile: -lpthread may still be necessary when libc has only pthread stubs
  Rewrite dynamic structure initializations to runtime assignment
  Makefile: pass CPPFLAGS through to fllow customization

Conflicts:
	Makefile
	wt-status.h
 2010-06-21 06:02:44 -07:00
Junio C Hamano
919e06b228 Merge branch 'bc/portable' 
* bc/portable:
  Remove python 2.5'isms
  Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
  t/aggregate-results: accomodate systems with small max argument list length
  t/t7006: ignore return status of shell's unset builtin
  t/t5150: remove space from sed script
  git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
  t/t5800: skip if python version is older than 2.5
 2010-06-21 06:02:42 -07:00
Junio C Hamano
a031d76eeb Merge branch 'jn/gitweb-fastcgi' 
* jn/gitweb-fastcgi:
  gitweb: Run in FastCGI mode if gitweb script has .fcgi extension
  gitweb: Add support for FastCGI, using CGI::Fast
  gitweb: Put all per-connection code in run() subroutine
 2010-06-21 06:02:42 -07:00
Junio C Hamano
f28f04923e Merge branch 'jn/checkout-doc' 
* jn/checkout-doc:
  Documentation/checkout: clarify description
  Documentation/checkout: clarify description
 2010-06-21 06:02:42 -07:00
Junio C Hamano
5bebcd4ecb Merge branch 'em/checkout-orphan' 
* em/checkout-orphan:
  log_ref_setup: don't return stack-allocated array
  bash completion: add --orphan to 'git checkout'
  t3200: test -l with core.logAllRefUpdates options
  checkout --orphan: respect -l option always
  refs: split log_ref_write logic into log_ref_setup
  Documentation: alter checkout --orphan description
 2010-06-21 06:02:41 -07:00
Junio C Hamano
8c6b5a8454 Drop items that are 1.7.1.1 fixes from the 1.7.1 release notes 2010-06-21 05:49:26 -07:00
Junio C Hamano
379e48fa5f Merge branch 'maint' 
* maint:
  Update draft release notes to 1.7.1.1
 2010-06-21 05:48:50 -07:00
Junio C Hamano
9932977173 Update draft release notes to 1.7.1.1 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2010-06-21 05:48:18 -07:00
Junio C Hamano
e7e1bf0c29 Merge branch 'mc/maint-zoneparse' into maint 
* mc/maint-zoneparse:
  Add "Z" as an alias for the timezone "UTC"
 2010-06-21 05:41:03 -07:00
Junio C Hamano
7a0d54facd Merge branch 'jk/diff-m-doc' into maint 
* jk/diff-m-doc:
  docs: clarify meaning of -M for git-log
 2010-06-21 05:40:57 -07:00
Junio C Hamano
b17847884f Merge branch 'jn/maint-doc-ignore' into maint 
* jn/maint-doc-ignore:
  gitignore.5: Clarify matching rules
 2010-06-21 05:40:53 -07:00
Junio C Hamano
065a652d64 Merge branch 'bs/userdiff-php' into maint 
* bs/userdiff-php:
  diff: Support visibility modifiers in the PHP hunk header regexp
 2010-06-21 05:40:48 -07:00
Junio C Hamano
951f92d2ab Merge branch 'jk/maint-sha1-file-name-fix' into maint 
* jk/maint-sha1-file-name-fix:
  remove over-eager caching in sha1_file_name
 2010-06-21 05:40:41 -07:00
Junio C Hamano
d0780b0643 Merge branch 'jk/maint-pull-dry-run-noop' into maint 
* jk/maint-pull-dry-run-noop:
  pull: do nothing on --dry-run
 2010-06-21 05:40:33 -07:00
Junio C Hamano
cb2af93ac1 Merge branch 'bw/diff-metainfo-color' into maint 
* bw/diff-metainfo-color:
  diff: fix coloring of extended diff headers
 2010-06-21 05:40:10 -07:00
Junio C Hamano
443f26cbca Merge branch 'cb/assume-unchanged-fix' into maint 
* cb/assume-unchanged-fix:
  Documentation: git-add does not update files marked "assume unchanged"
  do not overwrite files marked "assume unchanged"
 2010-06-21 05:39:23 -07:00
Junio C Hamano
1b9fa0e811 Merge branch 'jn/notes-doc' into maint 
* jn/notes-doc:
  Documentation/notes: nitpicks
  Documentation/notes: clean up description of rewriting configuration
  Documentation/notes: simplify treatment of default display refs
  Documentation/log: add a CONFIGURATION section
  Documentation/notes: simplify treatment of default notes ref
  Documentation/notes: add configuration section
  Documentation/notes: describe content of notes blobs
  Documentation/notes: document format of notes trees
 2010-06-21 05:39:16 -07:00
Junio C Hamano
6f79d66891 Merge branch 'ab/test-cleanup' into maint 
* ab/test-cleanup:
  Turn setup code in t2007-checkout-symlink.sh into a test
  Move t6000lib.sh to lib-*
 2010-06-21 05:39:02 -07:00
Junio C Hamano
60335534a6 Merge branch 'rs/diff-no-minimal' into maint 
* rs/diff-no-minimal:
  git diff too slow for a file
 2010-06-21 05:38:50 -07:00
Junio C Hamano
e1ba0f6340 Merge branch 'bg/apply-blank-trailing-context' into maint 
* bg/apply-blank-trailing-context:
  apply: Allow blank *trailing* context lines to match beyond EOF
 2010-06-21 05:38:36 -07:00
Junio C Hamano
b43688a5bc Merge branch 'maint' 
* maint:
  gitweb/Makefile: fix typo in gitweb.min.css rule

Conflicts:
	gitweb/Makefile
 2010-06-20 23:21:27 -07:00