AgeCommit message (Collapse)Author
2011-10-21Merge branch 'po/insn-editor'Junio C Hamano
* po/insn-editor: "rebase -i": support special-purpose editor to edit insn sheet
2011-10-21Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano
* jc/broken-ref-dwim-fix: resolve_ref(): report breakage to the caller without warning resolve_ref(): expose REF_ISBROKEN flag refs.c: move dwim_ref()/dwim_log() from sha1_name.c
2011-10-21Merge branch 'mh/ref-api'Junio C Hamano
* mh/ref-api: clear_ref_cache(): inline function write_ref_sha1(): only invalidate the loose ref cache clear_ref_cache(): extract two new functions clear_ref_cache(): rename parameter invalidate_ref_cache(): expose this function in the refs API invalidate_ref_cache(): take the submodule as parameter invalidate_ref_cache(): rename function from invalidate_cached_refs()
2011-10-21Merge branch 'jc/match-refs-clarify'Junio C Hamano
* jc/match-refs-clarify: rename "match_refs()" to "match_push_refs()" send-pack: typofix error message
2011-10-21Merge branch 'jc/make-tags'Junio C Hamano
* jc/make-tags: Makefile: ask "ls-files" to list source files if available
2011-10-21Merge branch 'ss/inet-ntop'Junio C Hamano
* ss/inet-ntop: inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables
2011-10-21Merge branch 'jc/maint-remove-renamed-ref'Junio C Hamano
* jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c
2011-10-21Merge branch 'pw/p4-update'Junio C Hamano
* pw/p4-update: git-p4: handle files with shell metacharacters git-p4: keyword flattening fixes git-p4: stop ignoring apple filetype git-p4: recognize all p4 filetypes git-p4: handle utf16 filetype properly git-p4 tests: refactor and cleanup
2011-10-21Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano
* cn/doc-config-bare-subsection: Documentation: update [section.subsection] to reflect what git does
2011-10-21Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano
* jk/maint-pack-objects-compete-with-delete: downgrade "packfile cannot be accessed" errors to warnings pack-objects: protect against disappearing packs
2011-10-21Merge branch 'jk/daemon-msgs'Junio C Hamano
* jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c
2011-10-21Merge branch 'sc/difftool-skip'Junio C Hamano
* sc/difftool-skip: t7800: avoid arithmetic expansion notation git-difftool: allow skipping file by typing 'n' at prompt
2011-10-21Merge branch 'jc/unseekable-bundle'Junio C Hamano
* jc/unseekable-bundle: bundle: add parse_bundle_header() helper function bundle: allowing to read from an unseekable fd Conflicts: transport.c
2011-10-21Merge branch 'ph/transport-with-gitfile'Junio C Hamano
* ph/transport-with-gitfile: Fix is_gitfile() for files too small or larger than PATH_MAX to be a gitfile Add test showing git-fetch groks gitfiles Teach transport about the gitfile mechanism Learn to handle gitfiles in enter_repo enter_repo: do not modify input
2011-10-21gitweb: fix regression when filtering out forksJulien Muchembled
This fixes a condition in filter_forks_from_projects_list that failed if process directory was different from project root: in such case, the subroutine was a no-op and forks were not detected. Signed-off-by: Julien Muchembled <> Tested-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2011-10-21Add simple test for Git::config_path() in t/t9700-perl-git.shJakub Narebski
Tests "~/foo" path expansion and multiple values. Signed-off-by: Jakub Narebski <> Signed-off-by: Junio C Hamano <>
2011-10-21completion: match ctags symbol names in grep patternsJeff King
A common thing to grep for is the name of a symbol. This patch teaches the completion for "git grep" to look in a 'tags' file, if present, to complete a pattern. For example, in git.git: $ make tags $ git grep get_sha1<Tab><Tab> get_sha1 get_sha1_oneline get_sha1_1 get_sha1_with_context get_sha1_basic get_sha1_with_context_1 get_sha1_hex get_sha1_with_mode get_sha1_hex_segment get_sha1_with_mode_1 get_sha1_mb Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2011-10-21contrib: add git-jump scriptJeff King
This is a small script for helping your editor jump to specific points of interest. See the README for details. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2011-10-21Sync with maintJunio C Hamano
2011-10-21Almost ready for C Hamano
Signed-off-by: Junio C Hamano <>
2011-10-21Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano
* nd/maint-autofix-tag-in-head: Accept tags in HEAD or MERGE_HEAD merge: remove global variable head[] merge: use return value of resolve_ref() to determine if HEAD is invalid merge: keep stash[] a local variable Conflicts: builtin/merge.c
2011-10-21Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano
* jc/apply-blank-at-eof-fix: apply --whitespace=error: correctly report new blank lines at end
2011-10-21Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano
* jn/no-g-plus-s-on-bsd: Makefile: do not set setgid bit on directories on GNU/kFreeBSD
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano
* rs/diff-cleanup-records-fix: diff: resurrect XDF_NEED_MINIMAL with --minimal Revert removal of multi-match discard heuristic in 27af01
2011-10-21Merge branch 'il/archive-err-signal' into maintJunio C Hamano
* il/archive-err-signal: Support ERR in remote archive like in fetch/push
2011-10-21Merge branch 'js/maint-merge-one-file-osx-expr' into maintJunio C Hamano
* js/maint-merge-one-file-osx-expr: merge-one-file: fix "expr: non-numeric argument"
2011-10-21Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maintJunio C Hamano
* jm/maint-apply-detects-corrupt-patch-header: fix "git apply --index ..." not to deref NULL
2011-10-21Merge branch 'jc/checkout-from-tree-keep-local-changes' into maintJunio C Hamano
* jc/checkout-from-tree-keep-local-changes: checkout $tree $path: do not clobber local changes in $path not in $tree
2011-10-21Merge branch 'mm/maint-config-explicit-bool-display' into maintJunio C Hamano
* mm/maint-config-explicit-bool-display: config: display key_delim for config --bool --get-regexp
2011-10-21gitweb: provide a way to customize html headersLénaïc Huard
This allows web sites to add some specific html headers to the pages generated by gitweb. The new variable $site_html_head_string can be set to an html snippet that will be inserted at the end of the <head> section of each page generated by gitweb. Signed-off-by: Lénaïc Huard <> Signed-off-by: Junio C Hamano <>
2011-10-21submodule::module_clone(): silence die() message from module_name()Tay Ray Chuan
The die() message that may occur in module_name() is not really relevant to the user when called from module_clone(); the latter handles the "failure" (no submodule mapping) anyway. Analysis of other callsites is left to future work. Acked-by: Jens Lehmann <> Signed-off-by: Tay Ray Chuan <> Signed-off-by: Junio C Hamano <>
2011-10-21submodule: whitespace fixTay Ray Chuan
Replace SPs with TAB. Signed-off-by: Tay Ray Chuan <> Signed-off-by: Junio C Hamano <>
2011-10-20tests: add missing executable bitsJeff King
Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
2011-10-20git-remote-mediawiki: don't include HTTP login/password in authorMatthieu Moy
On the MediaWiki side, the author information is just the MediaWiki login of the contributor. The import turns it into login@$wiki_name to create the author's email address on the wiki side. But we don't want this to include the HTTP password if it's present in the URL ... Signed-off-by: Matthieu Moy <> Signed-off-by: Junio C Hamano <>
2011-10-19resolve_ref(): report breakage to the caller without warningJunio C Hamano
629cd3a (resolve_ref(): emit warnings for improperly-formatted references, 2011-09-15) made resolve_ref() warn against files that are found in the directories the ref dwimmery looks at. The intent may be good, but these messages come from a wrong level of the API hierarchy. Instead record the breakage in "flags" whose purpose is to explain the result of the function to the caller, who is in a much better position to make intelligent decision based on the information. This updates sha1_name.c::dwim_ref() to warn against such a broken candidate only when it does not appear directly below $GIT_DIR to restore the traditional behaviour, as we know many files directly underneath $GIT_DIR/ are not refs. Warning against "git show config --" with "$GIT_DIR/config does not look like a well-formed ref" does not make sense, and we may later tweak the dwimmery not to even consider them as candidates, but that is a longer term topic. Signed-off-by: Junio C Hamano <>
2011-10-19resolve_ref(): expose REF_ISBROKEN flagJunio C Hamano
Instead of keeping this as an internal API, let the callers find out the reason why resolve_ref() returned NULL is not because there was no such file in $GIT_DIR but because a file was corrupt. Signed-off-by: Junio C Hamano <>
2011-10-19Update draft release notes to 1.7.8Junio C Hamano
Signed-off-by: Junio C Hamano <>
2011-10-19t/ use $SHELL_PATH to run git-new-workdir scriptBrandon Casey
Signed-off-by: Brandon Casey <> Signed-off-by: Junio C Hamano <>
2011-10-19Merge branch 'js/merge-edit-option'Junio C Hamano
* js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano
* rs/diff-whole-function: diff: add option to show whole functions as context xdiff: factor out get_func_line()
2011-10-19Merge branch 'rs/pickaxe'Junio C Hamano
* rs/pickaxe: pickaxe: factor out pickaxe pickaxe: give diff_grep the same signature as has_changes pickaxe: pass diff_options to contains and has_changes pickaxe: factor out has_changes pickaxe: plug regex/kws leak pickaxe: plug regex leak pickaxe: plug diff filespec leak with empty needle
2011-10-19Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano
* js/no-cherry-pick-head-after-punted: cherry-pick: do not give irrelevant advice when cherry-pick punted revert.c: defer writing CHERRY_PICK_HEAD till it is safe to do so
2011-10-19Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano
* bk/submodule-in-recursive-merge: submodule: Search for merges only at end of recursive merge submodule: Demonstrate known breakage during recursive merge
2011-10-19Merge branch 'jm/maint-apply-detects-corrupt-patch-header'Junio C Hamano
* jm/maint-apply-detects-corrupt-patch-header: fix "git apply --index ..." not to deref NULL
2011-10-19Merge branch 'jk/config-test-cleanup'Junio C Hamano
* jk/config-test-cleanup: t1300: attempting to remove a non-existent .git/config is not an error
2011-10-19t1300: attempting to remove a non-existent .git/config is not an errorJohannes Sixt
Since some tests before test number 79 ("quoting") are skipped, .git/config does not exist and 'rm .git/config' fails. Fix this particular case. While at it, move other instance of 'rm .git/config' that occur in this file inside the test function to document that the test cases want to protect themselves from remnants of earlier tests. Signed-off-by: Johannes Sixt <> Signed-off-by: Junio C Hamano <>
2011-10-19Merge branch 'js/log-show-children'Junio C Hamano
* js/log-show-children: log --children
2011-10-19Merge branch 'cb/httpd-test-fix-port'Junio C Hamano
* cb/httpd-test-fix-port: use test number as port number
2011-10-19Merge branch 'jn/gitweb-manpages'Junio C Hamano
* jn/gitweb-manpages: gitweb: Add gitweb manpages to 'gitweb' package in git.spec Documentation: Add gitweb config variables to git-config(1) Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages gitweb: Add gitweb(1) manpage for gitweb itself gitweb: Add gitweb.conf(5) manpage for gitweb configuration files
2011-10-19Merge branch 'pt/mingw-misc-fixes'Junio C Hamano
* pt/mingw-misc-fixes: t9901: fix line-ending dependency on windows mingw: ensure sockets are initialized before calling gethostname mergetools: use the correct tool for Beyond Compare 3 on Windows t9300: do not run --cat-blob-fd related tests on MinGW git-svn: On MSYS, escape and quote SVN_SSH also if set by the user t9001: do not fail only due to CR/LF issues t1020: disable the pwd test on MinGW