global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-19 21:20:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,655 Commits 6 Branches 1,000 Tags
ca22c9777be9734052ff731b6e8dbda29008c52d
Commit Graph

27655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Junio C Hamano
ca22c9777b Merge branch 'master' into next 
* master:
  Update draft release notes to 1.7.9
  Git 1.7.8.2
 2011-12-28 12:07:27 -08:00
Junio C Hamano
17b4e93d5b Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:07:22 -08:00
Junio C Hamano
48de6569eb Sync with 1.7.8.2 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-28 12:04:25 -08:00
Junio C Hamano
f3f778df69 Git 1.7.8.2 
Contains accumulated fixes since 1.7.8 that have been merged to the
'master' branch in preparation for the 1.7.9 release.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
v1.7.8.2 		2011-12-28 12:03:24 -08:00
Junio C Hamano
9a8e485430 Merge branch 'jv/maint-config-set' into maint 
* jv/maint-config-set:
  Fix an incorrect reference to --set-all.
 2011-12-28 12:03:19 -08:00
Junio C Hamano
0d57085943 Merge branch 'jk/follow-rename-score' into maint 
* jk/follow-rename-score:
  use custom rename score during --follow
 2011-12-28 11:49:37 -08:00
Junio C Hamano
9b0b0b4f45 Merge branch 'jc/checkout-m-twoway' into maint 
* jc/checkout-m-twoway:
  t/t2023-checkout-m.sh: fix use of test_must_fail
  checkout_merged(): squelch false warning from some gcc
  Test 'checkout -m -- path'
  checkout -m: no need to insist on having all 3 stages
 2011-12-28 11:44:54 -08:00
Junio C Hamano
00754b20f9 Merge branch 'tr/doc-sh-setup' into maint 
* tr/doc-sh-setup:
  git-sh-setup: make require_clean_work_tree part of the interface
 2011-12-28 11:42:51 -08:00
Junio C Hamano
b42e81afe2 Merge branch 'jk/maint-strbuf-missing-init' into maint 
* jk/maint-strbuf-missing-init:
  commit, merge: initialize static strbuf
 2011-12-28 11:42:46 -08:00
Junio C Hamano
4a242d6cb7 Merge branch 'jk/maint-push-v-is-verbose' into maint 
* jk/maint-push-v-is-verbose:
  make "git push -v" actually verbose
 2011-12-28 11:42:42 -08:00
Junio C Hamano
b5c12797b4 Merge branch 'jk/http-push-to-empty' into maint 
* jk/http-push-to-empty:
  remote-curl: don't pass back fake refs

Conflicts:
	remote-curl.c
 2011-12-28 11:42:37 -08:00
Junio C Hamano
81eaa0655f Merge branch 'jk/doc-fsck' into maint 
* jk/doc-fsck:
  docs: brush up obsolete bits of git-fsck manpage
 2011-12-28 11:42:33 -08:00
Junio C Hamano
23838b8a15 Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint 
* jc/maint-lf-to-crlf-keep-crlf:
  lf_to_crlf_filter(): resurrect CRLF->CRLF hack
 2011-12-28 11:42:27 -08:00
Junio C Hamano
e8f6b51a6b Merge branch 'ef/setenv-putenv' into maint 
* ef/setenv-putenv:
  compat/setenv.c: error if name contains '='
  compat/setenv.c: update errno when erroring out
 2011-12-28 11:42:24 -08:00
Junio C Hamano
3c06ab69b1 Merge branch 'jc/advice-doc' into maint 
* jc/advice-doc:
  advice: Document that they all default to true
 2011-12-28 11:32:39 -08:00
Junio C Hamano
770dd00ebd Merge branch 'jn/maint-sequencer-fixes' into maint 
* jn/maint-sequencer-fixes:
  revert: stop creating and removing sequencer-old directory
  Revert "reset: Make reset remove the sequencer state"
  revert: do not remove state until sequence is finished
  revert: allow single-pick in the middle of cherry-pick sequence
  revert: pass around rev-list args in already-parsed form
  revert: allow cherry-pick --continue to commit before resuming
  revert: give --continue handling its own function
 2011-12-28 11:32:39 -08:00
Junio C Hamano
7fc1495b18 Merge branch 'jk/maint-snprintf-va-copy' into maint 
* jk/maint-snprintf-va-copy:
  compat/snprintf: don't look at va_list twice
 2011-12-28 11:32:38 -08:00
Junio C Hamano
f1c12e1b4a Merge branch 'jk/maint-push-over-dav' into maint 
* jk/maint-push-over-dav:
  http-push: enable "proactive auth"
  t5540: test DAV push with authentication
 2011-12-28 11:32:37 -08:00
Junio C Hamano
699eb54876 Merge branch 'jk/maint-mv' into maint 
* jk/maint-mv:
  mv: be quiet about overwriting
  mv: improve overwrite warning
  mv: make non-directory destination error more clear
  mv: honor --verbose flag
  docs: mention "-k" for both forms of "git mv"
 2011-12-28 11:32:36 -08:00
Junio C Hamano
7a5638a159 Merge branch 'jk/fetch-no-tail-match-refs' into maint 
* jk/fetch-no-tail-match-refs:
  connect.c: drop path_match function
  fetch-pack: match refs exactly
  t5500: give fully-qualified refs to fetch-pack
  drop "match" parameter from get_remote_heads
 2011-12-28 11:32:36 -08:00
Junio C Hamano
2cb1ff9ac3 Merge branch 'ew/keepalive' into maint 
* ew/keepalive:
  enable SO_KEEPALIVE for connected TCP sockets
 2011-12-28 11:32:36 -08:00
Junio C Hamano
474294963e Merge branch 'ci/stripspace-docs' into maint 
* ci/stripspace-docs:
  Update documentation for stripspace
 2011-12-28 11:32:35 -08:00
Junio C Hamano
9ddb7ead52 Merge branch 'jh/fast-import-notes' into maint 
* jh/fast-import-notes:
  fast-import: Fix incorrect fanout level when modifying existing notes refs
  t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
  t9301: Fix testcase covering up a bug in fast-import's notes fanout handling
 2011-12-28 11:32:35 -08:00
Junio C Hamano
d9d73b37f3 Merge branch 'aw/rebase-i-stop-on-failure-to-amend' into maint 
* aw/rebase-i-stop-on-failure-to-amend:
  rebase -i: interrupt rebase when "commit --amend" failed during "reword"
 2011-12-28 11:32:34 -08:00
Junio C Hamano
4df989f953 Merge branch 'tj/maint-imap-send-remove-unused' into maint 
* tj/maint-imap-send-remove-unused:
  imap-send: Remove unused 'use_namespace' variable
 2011-12-28 11:32:34 -08:00
Junio C Hamano
79587741cb Merge branch 'jn/branch-move-to-self' into maint 
* jn/branch-move-to-self:
  Allow checkout -B <current-branch> to update the current branch
  branch: allow a no-op "branch -M <current-branch> HEAD"
 2011-12-28 11:32:33 -08:00
Junio C Hamano
e39888ba21 Merge branch 'na/strtoimax' into maint 
* na/strtoimax:
  Support sizes >=2G in various config options accepting 'g' sizes.
  Compatibility: declare strtoimax() under NO_STRTOUMAX
  Add strtoimax() compatibility function.
 2011-12-28 11:32:33 -08:00
Junio C Hamano
786a9611f4 Merge branch 'jk/refresh-porcelain-output' into maint 
* jk/refresh-porcelain-output:
  refresh_index: make porcelain output more specific
  refresh_index: rename format variables
  read-cache: let refresh_cache_ent pass up changed flags
 2011-12-28 11:32:32 -08:00
Junio C Hamano
551ac8f433 Merge branch 'jv/maint-config-set' into next 
* jv/maint-config-set:
  Fix an incorrect reference to --set-all.
 2011-12-27 13:58:37 -08:00
Jelmer Vernooij
67e223edc4 Fix an incorrect reference to --set-all. 
Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-27 11:14:18 -08:00
Junio C Hamano
d48220ff2e Merge branch 'master' into next 
* master:
  Update draft release notes in preparation for 1.7.9-rc0
 2011-12-22 15:36:53 -08:00
Junio C Hamano
ec330158ec Update draft release notes in preparation for 1.7.9-rc0 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-22 15:36:48 -08:00
Junio C Hamano
2b6dd6a2a8 Merge branch 'tr/bash-read-unescaped' 
* tr/bash-read-unescaped:
  bash completion: use read -r everywhere
 2011-12-22 15:30:38 -08:00
Junio C Hamano
35726681d5 Merge branch 'ab/sun-studio-portability' 
* ab/sun-studio-portability:
  Appease Sun Studio by renaming "tmpfile"
  Fix a bitwise negation assignment issue spotted by Sun Studio
  Fix an enum assignment issue spotted by Sun Studio
 2011-12-22 15:30:33 -08:00
Junio C Hamano
f0ede8435a Merge branch 'tr/doc-sh-setup' 
* tr/doc-sh-setup:
  git-sh-setup: make require_clean_work_tree part of the interface
 2011-12-22 15:30:29 -08:00
Junio C Hamano
c0129439d0 Merge branch 'rr/revert-cherry-pick' 
* rr/revert-cherry-pick:
  t3502, t3510: clarify cherry-pick -m failure
  t3510 (cherry-pick-sequencer): use exit status
  revert: simplify getting commit subject in format_todo()
  revert: tolerate extra spaces, tabs in insn sheet
  revert: make commit subjects in insn sheet optional
  revert: free msg in format_todo()
 2011-12-22 15:30:22 -08:00
Junio C Hamano
6fee20df5c Merge branch 'tr/pty-all' 
* tr/pty-all:
  test-terminal: set output terminals to raw mode
 2011-12-22 15:30:15 -08:00
Junio C Hamano
2b380d8191 Merge branch 'jn/maint-gitweb-utf8-fix' 
* jn/maint-gitweb-utf8-fix:
  gitweb: Fix fallback mode of to_utf8 subroutine
  gitweb: Output valid utf8 in git_blame_common('data')
  gitweb: esc_html() site name for title in OPML
  gitweb: Call to_utf8() on input string in chop_and_escape_str()
 2011-12-22 15:30:12 -08:00
Junio C Hamano
7d1ccddcec Merge branch 'master' into next 
* master:
  Update draft release notes to 1.7.9

Conflicts:
	builtin/commit.c
	commit.c
 2011-12-22 11:45:40 -08:00
Junio C Hamano
5d6dfc7cb1 Update draft release notes to 1.7.9 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2011-12-22 11:43:02 -08:00
Junio C Hamano
1aea303d7e Merge branch 'jk/maint-strbuf-missing-init' 
* jk/maint-strbuf-missing-init:
  commit, merge: initialize static strbuf

Conflicts:
	builtin/merge.c
 2011-12-22 11:27:31 -08:00
Junio C Hamano
339aff0846 Merge branch 'jc/maint-lf-to-crlf-keep-crlf' 
* jc/maint-lf-to-crlf-keep-crlf:
  lf_to_crlf_filter(): resurrect CRLF->CRLF hack
 2011-12-22 11:27:29 -08:00
Junio C Hamano
e927c16751 Merge branch 'rs/diff-tree-combined-clean-up' 
* rs/diff-tree-combined-clean-up:
  submodule: use diff_tree_combined_merge() instead of diff_tree_combined()
  pass struct commit to diff_tree_combined_merge()
  use struct sha1_array in diff_tree_combined()
 2011-12-22 11:27:29 -08:00
Junio C Hamano
c735ce4a1d Merge branch 'jk/maint-push-v-is-verbose' 
* jk/maint-push-v-is-verbose:
  make "git push -v" actually verbose
 2011-12-22 11:27:29 -08:00
Junio C Hamano
ced7469f07 Merge branch 'tr/grep-threading' 
* tr/grep-threading:
  grep: disable threading in non-worktree case
  grep: enable threading with -p and -W using lazy attribute lookup
  grep: load funcname patterns for -W
 2011-12-22 11:27:28 -08:00
Junio C Hamano
adb86762e5 Merge branch 'jk/pretty-reglog-ent' 
* jk/pretty-reglog-ent:
  pretty: give placeholders to reflog identity
 2011-12-22 11:27:28 -08:00
Junio C Hamano
d5cb31a56a Merge branch 'jk/follow-rename-score' 
* jk/follow-rename-score:
  use custom rename score during --follow
 2011-12-22 11:27:27 -08:00
Junio C Hamano
a4c628d71d Merge branch 'jk/doc-fsck' 
* jk/doc-fsck:
  docs: brush up obsolete bits of git-fsck manpage

Conflicts:
	Documentation/git-fsck.txt
 2011-12-22 11:27:27 -08:00
Junio C Hamano
f35ccd9be2 Merge branch 'nd/war-on-nul-in-commit' 
* nd/war-on-nul-in-commit:
  commit_tree(): refuse commit messages that contain NULs
  Convert commit_tree() to take strbuf as message
  merge: abort if fails to commit

Conflicts:
	builtin/commit.c
	commit.c
	commit.h
 2011-12-22 11:27:26 -08:00
Junio C Hamano
52b9d2cf7f Merge branch 'jk/maint-do-not-feed-stdin-to-tests' 
* jk/maint-do-not-feed-stdin-to-tests:
  test-lib: redirect stdin of tests
 2011-12-22 11:27:25 -08:00