gitweb.git
tree_entry_interesting(): give meaningful names to... Nguyễn Thái Ngọc Duy Mon, 24 Oct 2011 06:36:10 +0000 (17:36 +1100)

tree_entry_interesting(): give meaningful names to return values

It is a basic code hygiene to avoid magic constants that are unnamed.
Besides, this helps extending the value later on for "interesting, but
cannot decide if the entry truely matches yet" (ie. prefix matches)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

read_directory_recursive: reduce one indentation levelNguyễn Thái Ngọc Duy Mon, 24 Oct 2011 06:36:11 +0000 (17:36 +1100)

read_directory_recursive: reduce one indentation level

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

get_tree_entry(): do not call find_tree_entry() on... Junio C Hamano Thu, 27 Oct 2011 18:18:40 +0000 (11:18 -0700)

get_tree_entry(): do not call find_tree_entry() on an empty tree

We know we will find nothing.

This incidentally squelches false warning from gcc about potentially
uninitialized usage of t.entry fields. For an empty tree, it is true that
init_tree_desc() does not call decode_tree_entry() and the tree_desc is
left uninitialized, but find_tree_entry() only calls tree_entry_extract()
that uses the tree_desc while it has more things to read from the tree, so
the uninitialized t.entry fields are never used in such a case anyway.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

tree-walk.c: do not leak internal structure in tree_ent... Nguyễn Thái Ngọc Duy Mon, 24 Oct 2011 06:36:09 +0000 (17:36 +1100)

tree-walk.c: do not leak internal structure in tree_entry_len()

tree_entry_len() does not simply take two random arguments and return
a tree length. The two pointers must point to a tree item structure,
or struct name_entry. Passing random pointers will return incorrect
value.

Force callers to pass struct name_entry instead of two pointers (with
hope that they don't manually construct struct name_entry themselves)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Wed, 26 Oct 2011 23:24:55 +0000 (16:24 -0700)

Merge branch 'maint'

* maint:
make the sample pre-commit hook script reject names with newlines, too

Update draft release notes to 1.7.8Junio C Hamano Wed, 26 Oct 2011 23:23:26 +0000 (16:23 -0700)

Update draft release notes to 1.7.8

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'tc/submodule-clone-name-detection'Junio C Hamano Wed, 26 Oct 2011 23:16:32 +0000 (16:16 -0700)

Merge branch 'tc/submodule-clone-name-detection'

* tc/submodule-clone-name-detection:
submodule::module_clone(): silence die() message from module_name()
submodule: whitespace fix

Merge branch 'lh/gitweb-site-html-head'Junio C Hamano Wed, 26 Oct 2011 23:16:31 +0000 (16:16 -0700)

Merge branch 'lh/gitweb-site-html-head'

* lh/gitweb-site-html-head:
gitweb: provide a way to customize html headers

Merge branch 'mm/mediawiki-author-fix'Junio C Hamano Wed, 26 Oct 2011 23:16:31 +0000 (16:16 -0700)

Merge branch 'mm/mediawiki-author-fix'

* mm/mediawiki-author-fix:
git-remote-mediawiki: don't include HTTP login/password in author

Merge branch 'jn/libperl-git-config'Junio C Hamano Wed, 26 Oct 2011 23:16:30 +0000 (16:16 -0700)

Merge branch 'jn/libperl-git-config'

* jn/libperl-git-config:
Add simple test for Git::config_path() in t/t9700-perl-git.sh
libperl-git: refactor Git::config_*

Merge branch 'jm/maint-gitweb-filter-forks-fix'Junio C Hamano Wed, 26 Oct 2011 23:16:30 +0000 (16:16 -0700)

Merge branch 'jm/maint-gitweb-filter-forks-fix'

* jm/maint-gitweb-filter-forks-fix:
gitweb: fix regression when filtering out forks

Merge branch 'cn/fetch-prune'Junio C Hamano Wed, 26 Oct 2011 23:16:29 +0000 (16:16 -0700)

Merge branch 'cn/fetch-prune'

* cn/fetch-prune:
fetch: treat --tags like refs/tags/*:refs/tags/* when pruning
fetch: honor the user-provided refspecs when pruning refs
remote: separate out the remote_find_tracking logic into query_refspecs
t5510: add tests for fetch --prune
fetch: free all the additional refspecs

Conflicts:
remote.c

Merge branch 'jn/gitweb-highlite-sanitise' into maintJunio C Hamano Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)

Merge branch 'jn/gitweb-highlite-sanitise' into maint

* jn/gitweb-highlite-sanitise:
gitweb: Strip non-printable characters from syntax highlighter output

Merge branch 'jk/argv-array' into maintJunio C Hamano Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)

Merge branch 'jk/argv-array' into maint

* jk/argv-array:
run_hook: use argv_array API
checkout: use argv_array API
bisect: use argv_array API
quote: provide sq_dequote_to_argv_array
refactor argv_array into generic code
quote.h: fix bogus comment
add sha1_array API docs

Merge branch 'jc/run-receive-hook-cleanup' into maintJunio C Hamano Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)

Merge branch 'jc/run-receive-hook-cleanup' into maint

* jc/run-receive-hook-cleanup:
refactor run_receive_hook()

Merge branch 'cn/eradicate-working-copy' into maintJunio C Hamano Wed, 26 Oct 2011 23:13:31 +0000 (16:13 -0700)

Merge branch 'cn/eradicate-working-copy' into maint

* cn/eradicate-working-copy:
Remove 'working copy' from the documentation and C code

Merge branch 'maint-1.7.6' into maintJunio C Hamano Wed, 26 Oct 2011 23:13:27 +0000 (16:13 -0700)

Merge branch 'maint-1.7.6' into maint

* maint-1.7.6:
notes_merge_commit(): do not pass temporary buffer to other function
gitweb: Fix links to lines in blobs when javascript-actions are enabled
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files
t9159-*.sh: skip for mergeinfo test for svn <= 1.4
date.c: Support iso8601 timezone formats
remote: only update remote-tracking branch if updating refspec
remote rename: warn when refspec was not updated
remote: "rename o foo" should not rename ref "origin/bar"
remote: write correct fetch spec when renaming remote 'remote'

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into... Junio C Hamano Wed, 26 Oct 2011 23:12:48 +0000 (16:12 -0700)

Merge branch 'mh/maint-notes-merge-pathbuf-fix' into maint-1.7.6

* mh/maint-notes-merge-pathbuf-fix:
notes_merge_commit(): do not pass temporary buffer to other function

Merge branch 'ps/gitweb-js-with-lineno' into maint... Junio C Hamano Wed, 26 Oct 2011 23:12:35 +0000 (16:12 -0700)

Merge branch 'ps/gitweb-js-with-lineno' into maint-1.7.6

* ps/gitweb-js-with-lineno:
gitweb: Fix links to lines in blobs when javascript-actions are enabled

Merge branch 'jm/mergetool-pathspec' into maint-1.7.6Junio C Hamano Wed, 26 Oct 2011 23:12:25 +0000 (16:12 -0700)

Merge branch 'jm/mergetool-pathspec' into maint-1.7.6

* jm/mergetool-pathspec:
mergetool: no longer need to save standard input
mergetool: Use args as pathspec to unmerged files

Merge branch 'mz/remote-rename' into maint-1.7.6Junio C Hamano Wed, 26 Oct 2011 23:12:19 +0000 (16:12 -0700)

Merge branch 'mz/remote-rename' into maint-1.7.6

* mz/remote-rename:
remote: only update remote-tracking branch if updating refspec
remote rename: warn when refspec was not updated
remote: "rename o foo" should not rename ref "origin/bar"
remote: write correct fetch spec when renaming remote 'remote'

Merge branch 'rj/maint-t9159-svn-rev-notation' into... Junio C Hamano Wed, 26 Oct 2011 23:12:13 +0000 (16:12 -0700)

Merge branch 'rj/maint-t9159-svn-rev-notation' into maint-1.7.6

* rj/maint-t9159-svn-rev-notation:
t9159-*.sh: skip for mergeinfo test for svn <= 1.4

Merge branch 'hl/iso8601-more-zone-formats' into maint... Junio C Hamano Wed, 26 Oct 2011 23:11:28 +0000 (16:11 -0700)

Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6

* hl/iso8601-more-zone-formats:
date.c: Support iso8601 timezone formats

Merge branch 'maint-1.7.6' into maintJunio C Hamano Wed, 26 Oct 2011 23:09:28 +0000 (16:09 -0700)

Merge branch 'maint-1.7.6' into maint

* maint-1.7.6:
make the sample pre-commit hook script reject names with newlines, too
git-read-tree.txt: update sparse checkout examples
git-read-tree.txt: correct sparse-checkout and skip-worktree description
git-read-tree.txt: language and typography fixes
unpack-trees: print "Aborting" to stderr
Documentation/git-update-index: refer to 'ls-files'
Documentation: basic configuration of notes.rewriteRef

Merge branch 'tr/doc-note-rewrite' into maint-1.7.6Junio C Hamano Wed, 26 Oct 2011 23:09:04 +0000 (16:09 -0700)

Merge branch 'tr/doc-note-rewrite' into maint-1.7.6

* tr/doc-note-rewrite:
Documentation: basic configuration of notes.rewriteRef

Merge branch 'nd/sparse-doc' into maint-1.7.6Junio C Hamano Wed, 26 Oct 2011 23:09:04 +0000 (16:09 -0700)

Merge branch 'nd/sparse-doc' into maint-1.7.6

* nd/sparse-doc:
git-read-tree.txt: update sparse checkout examples

Merge branch 'mg/maint-doc-sparse-checkout' into maint... Junio C Hamano Wed, 26 Oct 2011 23:09:03 +0000 (16:09 -0700)

Merge branch 'mg/maint-doc-sparse-checkout' into maint-1.7.6

* mg/maint-doc-sparse-checkout:
git-read-tree.txt: correct sparse-checkout and skip-worktree description
git-read-tree.txt: language and typography fixes
unpack-trees: print "Aborting" to stderr

Merge branch 'maint-1.7.5' into maint-1.7.6Junio C Hamano Wed, 26 Oct 2011 23:08:19 +0000 (16:08 -0700)

Merge branch 'maint-1.7.5' into maint-1.7.6

* maint-1.7.5:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'

Merge branch 'maint-1.7.4' into maint-1.7.5Junio C Hamano Wed, 26 Oct 2011 23:08:14 +0000 (16:08 -0700)

Merge branch 'maint-1.7.4' into maint-1.7.5

* maint-1.7.4:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'

Merge branch 'maint-1.7.3' into maint-1.7.4Junio C Hamano Wed, 26 Oct 2011 23:08:08 +0000 (16:08 -0700)

Merge branch 'maint-1.7.3' into maint-1.7.4

* maint-1.7.3:
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Documentation/git-update-index: refer to 'ls-files'

Merge branch 'sn/doc-update-index-assume-unchanged... Junio C Hamano Wed, 26 Oct 2011 23:08:00 +0000 (16:08 -0700)

Merge branch 'sn/doc-update-index-assume-unchanged' into maint-1.7.3

* sn/doc-update-index-assume-unchanged:
Documentation/git-update-index: refer to 'ls-files'

make the sample pre-commit hook script reject names... Jim Meyering Sat, 22 Oct 2011 17:44:40 +0000 (19:44 +0200)

make the sample pre-commit hook script reject names with newlines, too

The sample pre-commit hook script would fail to reject a file name like
"a\nb" because of the way newlines are handled in "$(...)". Adjust the
test to count filtered bytes and require there be 0. Also print all
diagnostics to standard error, not stdout, so they will actually be seen.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 24 Oct 2011 06:55:28 +0000 (23:55 -0700)

Merge branch 'maint'

* maint:
Reindent closing bracket using tab instead of spaces

Merge branch 'maint-1.7.3' into maintJunio C Hamano Mon, 24 Oct 2011 06:55:22 +0000 (23:55 -0700)

Merge branch 'maint-1.7.3' into maint

* maint-1.7.3:
Reindent closing bracket using tab instead of spaces

Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy Mon, 24 Oct 2011 04:24:51 +0000 (15:24 +1100)

Reindent closing bracket using tab instead of spaces

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'maint'Junio C Hamano Mon, 24 Oct 2011 04:49:14 +0000 (21:49 -0700)

Merge branch 'maint'

* maint:
Git 1.7.7.1
RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

Conflicts:
GIT-VERSION-GEN

Git 1.7.7.1 v1.7.7.1Junio C Hamano Mon, 24 Oct 2011 04:48:06 +0000 (21:48 -0700)

Git 1.7.7.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

RelNotes/1.7.7.1: setgid bit patch is about fixing... Jonathan Nieder Sat, 22 Oct 2011 11:11:07 +0000 (06:11 -0500)

RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting

The change was actually about "git init -s" which sets the setgid bit on
SysV-style systems to allow shared access to a repository, and can provoke
errors on BSD-style systems, depending on how permissive the filesystem in
use wants to be.

More to the point, the patch was just taking a fix that arrived for
FreeBSD in v1.5.5 days and making it also apply to machines using an
(obscure) GNU userland/FreeBSD kernel mixture.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.8Junio C Hamano Fri, 21 Oct 2011 18:46:12 +0000 (11:46 -0700)

Update draft release notes to 1.7.8

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'po/insn-editor'Junio C Hamano Fri, 21 Oct 2011 23:04:37 +0000 (16:04 -0700)

Merge branch 'po/insn-editor'

* po/insn-editor:
"rebase -i": support special-purpose editor to edit insn sheet

Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano Fri, 21 Oct 2011 23:04:36 +0000 (16:04 -0700)

Merge branch 'jc/broken-ref-dwim-fix'

* 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

Merge branch 'mh/ref-api'Junio C Hamano Fri, 21 Oct 2011 23:04:36 +0000 (16:04 -0700)

Merge branch 'mh/ref-api'

* 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()

Merge branch 'jc/match-refs-clarify'Junio C Hamano Fri, 21 Oct 2011 23:04:35 +0000 (16:04 -0700)

Merge branch 'jc/match-refs-clarify'

* jc/match-refs-clarify:
rename "match_refs()" to "match_push_refs()"
send-pack: typofix error message

Merge branch 'jc/make-tags'Junio C Hamano Fri, 21 Oct 2011 23:04:35 +0000 (16:04 -0700)

Merge branch 'jc/make-tags'

* jc/make-tags:
Makefile: ask "ls-files" to list source files if available

Merge branch 'ss/inet-ntop'Junio C Hamano Fri, 21 Oct 2011 23:04:35 +0000 (16:04 -0700)

Merge branch 'ss/inet-ntop'

* ss/inet-ntop:
inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

Merge branch 'jc/maint-remove-renamed-ref'Junio C Hamano Fri, 21 Oct 2011 23:04:34 +0000 (16:04 -0700)

Merge branch 'jc/maint-remove-renamed-ref'

* jc/maint-remove-renamed-ref:
branch -m/-M: remove undocumented RENAMED-REF

Conflicts:
refs.c

Merge branch 'pw/p4-update'Junio C Hamano Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700)

Merge branch 'pw/p4-update'

* 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

Merge branch 'cn/doc-config-bare-subsection'Junio C Hamano Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700)

Merge branch 'cn/doc-config-bare-subsection'

* cn/doc-config-bare-subsection:
Documentation: update [section.subsection] to reflect what git does

Merge branch 'jk/maint-pack-objects-compete-with-delete'Junio C Hamano Fri, 21 Oct 2011 23:04:33 +0000 (16:04 -0700)

Merge branch 'jk/maint-pack-objects-compete-with-delete'

* jk/maint-pack-objects-compete-with-delete:
downgrade "packfile cannot be accessed" errors to warnings
pack-objects: protect against disappearing packs

Merge branch 'jk/daemon-msgs'Junio C Hamano Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)

Merge branch 'jk/daemon-msgs'

* jk/daemon-msgs:
daemon: give friendlier error messages to clients

Conflicts:
daemon.c

Merge branch 'sc/difftool-skip'Junio C Hamano Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)

Merge branch 'sc/difftool-skip'

* sc/difftool-skip:
t7800: avoid arithmetic expansion notation
git-difftool: allow skipping file by typing 'n' at prompt

Merge branch 'jc/unseekable-bundle'Junio C Hamano Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)

Merge branch 'jc/unseekable-bundle'

* jc/unseekable-bundle:
bundle: add parse_bundle_header() helper function
bundle: allowing to read from an unseekable fd

Conflicts:
transport.c

Merge branch 'ph/transport-with-gitfile'Junio C Hamano Fri, 21 Oct 2011 23:04:32 +0000 (16:04 -0700)

Merge branch 'ph/transport-with-gitfile'

* 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

gitweb: fix regression when filtering out forksJulien Muchembled Fri, 21 Oct 2011 19:04:21 +0000 (21:04 +0200)

gitweb: fix regression when filtering out forks

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 <jm@jmuchemb.eu>
Tested-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Add simple test for Git::config_path() in t/t9700-perl... Jakub Narebski Fri, 21 Oct 2011 18:42:44 +0000 (20:42 +0200)

Add simple test for Git::config_path() in t/t9700-perl-git.sh

Tests "~/foo" path expansion and multiple values.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sync with maintJunio C Hamano Fri, 21 Oct 2011 18:08:10 +0000 (11:08 -0700)

Sync with maint

Almost ready for 1.7.7.1Junio C Hamano Fri, 21 Oct 2011 18:01:07 +0000 (11:01 -0700)

Almost ready for 1.7.7.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'nd/maint-autofix-tag-in-head' into maintJunio C Hamano Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)

Merge branch 'nd/maint-autofix-tag-in-head' into maint

* 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

Merge branch 'jc/apply-blank-at-eof-fix' into maintJunio C Hamano Fri, 21 Oct 2011 17:49:26 +0000 (10:49 -0700)

Merge branch 'jc/apply-blank-at-eof-fix' into maint

* jc/apply-blank-at-eof-fix:
apply --whitespace=error: correctly report new blank lines at end

Merge branch 'jn/no-g-plus-s-on-bsd' into maintJunio C Hamano Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)

Merge branch 'jn/no-g-plus-s-on-bsd' into maint

* jn/no-g-plus-s-on-bsd:
Makefile: do not set setgid bit on directories on GNU/kFreeBSD

Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)

Merge branch 'rs/diff-cleanup-records-fix' into maint

* rs/diff-cleanup-records-fix:
diff: resurrect XDF_NEED_MINIMAL with --minimal
Revert removal of multi-match discard heuristic in 27af01

Merge branch 'il/archive-err-signal' into maintJunio C Hamano Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)

Merge branch 'il/archive-err-signal' into maint

* il/archive-err-signal:
Support ERR in remote archive like in fetch/push

Merge branch 'js/maint-merge-one-file-osx-expr' into... Junio C Hamano Fri, 21 Oct 2011 17:49:25 +0000 (10:49 -0700)

Merge branch 'js/maint-merge-one-file-osx-expr' into maint

* js/maint-merge-one-file-osx-expr:
merge-one-file: fix "expr: non-numeric argument"

Merge branch 'jm/maint-apply-detects-corrupt-patch... Junio C Hamano Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)

Merge branch 'jm/maint-apply-detects-corrupt-patch-header' into maint

* jm/maint-apply-detects-corrupt-patch-header:
fix "git apply --index ..." not to deref NULL

Merge branch 'jc/checkout-from-tree-keep-local-changes... Junio C Hamano Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)

Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint

* jc/checkout-from-tree-keep-local-changes:
checkout $tree $path: do not clobber local changes in $path not in $tree

Merge branch 'mm/maint-config-explicit-bool-display... Junio C Hamano Fri, 21 Oct 2011 17:49:24 +0000 (10:49 -0700)

Merge branch 'mm/maint-config-explicit-bool-display' into maint

* mm/maint-config-explicit-bool-display:
config: display key_delim for config --bool --get-regexp

gitweb: provide a way to customize html headersLénaïc Huard Fri, 21 Oct 2011 07:09:29 +0000 (09:09 +0200)

gitweb: provide a way to customize html headers

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 <lenaic@lhuard.fr.eu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule::module_clone(): silence die() message from... Tay Ray Chuan Fri, 21 Oct 2011 13:49:36 +0000 (21:49 +0800)

submodule::module_clone(): silence die() message from module_name()

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 <Jens.Lehmann@web.de>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

submodule: whitespace fixTay Ray Chuan Fri, 21 Oct 2011 13:49:35 +0000 (21:49 +0800)

submodule: whitespace fix

Replace SPs with TAB.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

tests: add missing executable bitsJeff King Thu, 20 Oct 2011 21:58:33 +0000 (17:58 -0400)

tests: add missing executable bits

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

git-remote-mediawiki: don't include HTTP login/password... Matthieu Moy Thu, 20 Oct 2011 17:04:59 +0000 (19:04 +0200)

git-remote-mediawiki: don't include HTTP login/password in author

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 <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

resolve_ref(): report breakage to the caller without... Junio C Hamano Wed, 19 Oct 2011 20:55:49 +0000 (13:55 -0700)

resolve_ref(): report breakage to the caller without warning

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 <gitster@pobox.com>

resolve_ref(): expose REF_ISBROKEN flagJunio C Hamano Wed, 19 Oct 2011 20:45:50 +0000 (13:45 -0700)

resolve_ref(): expose REF_ISBROKEN flag

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 <gitster@pobox.com>

Update draft release notes to 1.7.8Junio C Hamano Wed, 19 Oct 2011 05:03:30 +0000 (22:03 -0700)

Update draft release notes to 1.7.8

Signed-off-by: Junio C Hamano <gitster@pobox.com>

t/t3000-ls-files-others.sh: use $SHELL_PATH to run... Brandon Casey Wed, 19 Oct 2011 16:26:02 +0000 (09:26 -0700)

t/t3000-ls-files-others.sh: use $SHELL_PATH to run git-new-workdir script

Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'js/merge-edit-option'Junio C Hamano Wed, 19 Oct 2011 17:49:27 +0000 (10:49 -0700)

Merge branch 'js/merge-edit-option'

* js/merge-edit-option:
Teach merge the '[-e|--edit]' option

Conflicts:
builtin/merge.c

Merge branch 'rs/diff-whole-function'Junio C Hamano Wed, 19 Oct 2011 17:49:13 +0000 (10:49 -0700)

Merge branch 'rs/diff-whole-function'

* rs/diff-whole-function:
diff: add option to show whole functions as context
xdiff: factor out get_func_line()

Merge branch 'rs/pickaxe'Junio C Hamano Wed, 19 Oct 2011 17:49:09 +0000 (10:49 -0700)

Merge branch 'rs/pickaxe'

* 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

Merge branch 'js/no-cherry-pick-head-after-punted'Junio C Hamano Wed, 19 Oct 2011 17:49:05 +0000 (10:49 -0700)

Merge branch 'js/no-cherry-pick-head-after-punted'

* 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

Merge branch 'bk/submodule-in-recursive-merge'Junio C Hamano Wed, 19 Oct 2011 17:48:38 +0000 (10:48 -0700)

Merge branch 'bk/submodule-in-recursive-merge'

* bk/submodule-in-recursive-merge:
submodule: Search for merges only at end of recursive merge
submodule: Demonstrate known breakage during recursive merge

Merge branch 'jm/maint-apply-detects-corrupt-patch... Junio C Hamano Wed, 19 Oct 2011 17:48:29 +0000 (10:48 -0700)

Merge branch 'jm/maint-apply-detects-corrupt-patch-header'

* jm/maint-apply-detects-corrupt-patch-header:
fix "git apply --index ..." not to deref NULL

Merge branch 'jk/config-test-cleanup'Junio C Hamano Wed, 19 Oct 2011 17:47:59 +0000 (10:47 -0700)

Merge branch 'jk/config-test-cleanup'

* jk/config-test-cleanup:
t1300: attempting to remove a non-existent .git/config is not an error

t1300: attempting to remove a non-existent .git/config... Johannes Sixt Wed, 19 Oct 2011 07:37:06 +0000 (09:37 +0200)

t1300: attempting to remove a non-existent .git/config is not an error

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 <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'js/log-show-children'Junio C Hamano Wed, 19 Oct 2011 04:59:12 +0000 (21:59 -0700)

Merge branch 'js/log-show-children'

* js/log-show-children:
log --children

Merge branch 'cb/httpd-test-fix-port'Junio C Hamano Wed, 19 Oct 2011 04:59:11 +0000 (21:59 -0700)

Merge branch 'cb/httpd-test-fix-port'

* cb/httpd-test-fix-port:
use test number as port number

Merge branch 'jn/gitweb-manpages'Junio C Hamano Wed, 19 Oct 2011 04:59:11 +0000 (21:59 -0700)

Merge branch 'jn/gitweb-manpages'

* 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

Merge branch 'pt/mingw-misc-fixes'Junio C Hamano Wed, 19 Oct 2011 04:59:11 +0000 (21:59 -0700)

Merge branch 'pt/mingw-misc-fixes'

* 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

Merge branch 'md/smtp-tls-hello-again'Junio C Hamano Wed, 19 Oct 2011 04:59:10 +0000 (21:59 -0700)

Merge branch 'md/smtp-tls-hello-again'

* md/smtp-tls-hello-again:
send-email: Honour SMTP domain when using TLS

Merge branch 'maint'Junio C Hamano Wed, 19 Oct 2011 04:42:41 +0000 (21:42 -0700)

Merge branch 'maint'

* maint:
strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()

strbuf.c: remove unnecessary strbuf_grow() from strbuf_... Brandon Casey Thu, 6 Oct 2011 04:21:33 +0000 (23:21 -0500)

strbuf.c: remove unnecessary strbuf_grow() from strbuf_getwholeline()

This use of strbuf_grow() is a historical artifact that was once used to
ensure that strbuf.buf was allocated and properly nul-terminated. This
was added before the introduction of the slopbuf in b315c5c0, which
guarantees that strbuf.buf always points to a usable nul-terminated string.
So let's remove it.

Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

libperl-git: refactor Git::config_*Junio C Hamano Tue, 18 Oct 2011 09:47:01 +0000 (11:47 +0200)

libperl-git: refactor Git::config_*

Move common parts of Git::config(), Git::config_bool(), Git::config_int()
and Git::config_path() into _config_common() helper.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

inet_ntop.c: Work around GCC 4.6's detection of uniniti... Sebastian Schuberth Tue, 18 Oct 2011 16:25:50 +0000 (18:25 +0200)

inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables

GCC 4.6 claims that

error: 'best.len' may be used uninitialized in this function

so silence that warning which is treated as an error by also initializing
the "len" members of the struct.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Makefile: ask "ls-files" to list source files if availableJunio C Hamano Tue, 18 Oct 2011 07:26:18 +0000 (00:26 -0700)

Makefile: ask "ls-files" to list source files if available

The [ce]tags and cscope targets used to run "find" looking for any paths
that match '*.[chS]' to feed the list of source files to downstream xargs.

Use "git ls-files" if it is already available to us, and otherwise use a
tighter "find" expression that does not list directories and does not go
into our .git directory.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Update draft release notes to 1.7.8Junio C Hamano Tue, 18 Oct 2011 05:07:57 +0000 (22:07 -0700)

Update draft release notes to 1.7.8

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Merge branch 'jk/http-auth'Junio C Hamano Tue, 18 Oct 2011 04:37:15 +0000 (21:37 -0700)

Merge branch 'jk/http-auth'

* jk/http-auth:
http_init: accept separate URL parameter
http: use hostname in credential description
http: retry authentication failures for all http requests
remote-curl: don't retry auth failures with dumb protocol
improve httpd auth tests
url: decode buffers that are not NUL-terminated

Merge branch 'js/check-ref-format-test-mingw'Junio C Hamano Tue, 18 Oct 2011 04:37:15 +0000 (21:37 -0700)

Merge branch 'js/check-ref-format-test-mingw'

* js/check-ref-format-test-mingw:
t1402-check-ref-format: skip tests of refs beginning with slash on Windows

Merge branch 'jk/pull-rebase-with-work-tree'Junio C Hamano Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700)

Merge branch 'jk/pull-rebase-with-work-tree'

* jk/pull-rebase-with-work-tree:
pull,rebase: handle GIT_WORK_TREE better

Conflicts:
git-pull.sh

Merge branch 'jk/config-test-cleanup'Junio C Hamano Tue, 18 Oct 2011 04:37:14 +0000 (21:37 -0700)

Merge branch 'jk/config-test-cleanup'

* jk/config-test-cleanup:
t1300: test mixed-case variable retrieval
t1300: put git invocations inside test function

Merge branch 'bc/attr-ignore-case'Junio C Hamano Tue, 18 Oct 2011 04:37:13 +0000 (21:37 -0700)

Merge branch 'bc/attr-ignore-case'

* bc/attr-ignore-case:
attr.c: respect core.ignorecase when matching attribute patterns
attr: read core.attributesfile from git_default_core_config
builtin/mv.c: plug miniscule memory leak
cleanup: use internal memory allocation wrapper functions everywhere
attr.c: avoid inappropriate access to strbuf "buf" member

Conflicts:
transport-helper.c

Merge branch 'sg/completion'Junio C Hamano Tue, 18 Oct 2011 04:37:13 +0000 (21:37 -0700)

Merge branch 'sg/completion'

* sg/completion:
completion: unite --format and --pretty for 'log' and 'show'
completion: unite --reuse-message and --reedit-message for 'notes'