be3fa91 | Junio C Hamano | 31 October 2011, 02:14:24 UTC | Git 1.7.8-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 October 2011, 02:14:24 UTC |
324bc2a | Junio C Hamano | 31 October 2011, 02:13:13 UTC | Merge branch 'jk/git-tricks' * jk/git-tricks: completion: match ctags symbol names in grep patterns contrib: add git-jump script contrib: add diff highlight script | 31 October 2011, 02:13:13 UTC |
e8e1c29 | Junio C Hamano | 27 October 2011, 19:06:44 UTC | Update draft release notes to 1.7.8 Getting very close to -rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2011, 19:06:44 UTC |
4801546 | Junio C Hamano | 27 October 2011, 19:04:28 UTC | Merge branch 'sn/complete-bash-wo-process-subst' * sn/complete-bash-wo-process-subst: completion: fix issue with process substitution not working on Git for Windows | 27 October 2011, 19:04:28 UTC |
f124fe3 | Junio C Hamano | 27 October 2011, 19:04:21 UTC | Merge branch 'rj/gitweb-clean-js' * rj/gitweb-clean-js: gitweb/Makefile: Remove static/gitweb.js in the clean target | 27 October 2011, 19:04:21 UTC |
220c045 | Junio C Hamano | 27 October 2011, 19:04:02 UTC | Merge branch 'js/grep-mutex' * js/grep-mutex: builtin/grep: simplify lock_and_read_sha1_file() builtin/grep: make lock/unlock into static inline functions git grep: be careful to use mutexes only when they are initialized | 27 October 2011, 19:04:02 UTC |
82bc9f5 | Junio C Hamano | 27 October 2011, 19:03:37 UTC | Merge branch 'maint' * maint: clone: Quote user supplied path in a single quote pair read-cache.c: fix index memory allocation | 27 October 2011, 19:03:37 UTC |
a76a326 | Junio C Hamano | 27 October 2011, 19:03:16 UTC | Merge branch 'rs/maint-estimate-cache-size' into maint * rs/maint-estimate-cache-size: read-cache.c: fix index memory allocation | 27 October 2011, 19:03:16 UTC |
8debf69 | Richard Hartmann | 27 October 2011, 16:46:53 UTC | clone: Quote user supplied path in a single quote pair Without this patch, $ git clone foo . results in this: Cloning into .... done. With it: Cloning into '.'... done. Signed-off-by: Richard Hartmann <richih.mailinglist@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2011, 19:02:02 UTC |
997a194 | Junio C Hamano | 26 October 2011, 23:24:55 UTC | Merge branch 'maint' * maint: make the sample pre-commit hook script reject names with newlines, too | 26 October 2011, 23:24:55 UTC |
425c771 | Junio C Hamano | 26 October 2011, 23:23:26 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 23:23:26 UTC |
0b26d1e | Junio C Hamano | 26 October 2011, 23:16:32 UTC | Merge branch 'tc/submodule-clone-name-detection' * tc/submodule-clone-name-detection: submodule::module_clone(): silence die() message from module_name() submodule: whitespace fix | 26 October 2011, 23:16:32 UTC |
208a1cc | Junio C Hamano | 26 October 2011, 23:16:31 UTC | Merge branch 'lh/gitweb-site-html-head' * lh/gitweb-site-html-head: gitweb: provide a way to customize html headers | 26 October 2011, 23:16:31 UTC |
2ef89f3 | Junio C Hamano | 26 October 2011, 23:16:31 UTC | Merge branch 'mm/mediawiki-author-fix' * mm/mediawiki-author-fix: git-remote-mediawiki: don't include HTTP login/password in author | 26 October 2011, 23:16:31 UTC |
3b6a5d2 | Junio C Hamano | 26 October 2011, 23:16:30 UTC | 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_* | 26 October 2011, 23:16:30 UTC |
aface4c | Junio C Hamano | 26 October 2011, 23:16:30 UTC | Merge branch 'jm/maint-gitweb-filter-forks-fix' * jm/maint-gitweb-filter-forks-fix: gitweb: fix regression when filtering out forks | 26 October 2011, 23:16:30 UTC |
9c0c09f | Junio C Hamano | 26 October 2011, 23:16:29 UTC | 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 | 26 October 2011, 23:16:29 UTC |
25f745f | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jn/gitweb-highlite-sanitise' into maint * jn/gitweb-highlite-sanitise: gitweb: Strip non-printable characters from syntax highlighter output | 26 October 2011, 23:13:31 UTC |
60f60b4 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | 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 | 26 October 2011, 23:13:31 UTC |
7bb07f6 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'jc/run-receive-hook-cleanup' into maint * jc/run-receive-hook-cleanup: refactor run_receive_hook() | 26 October 2011, 23:13:31 UTC |
a5ad8d1 | Junio C Hamano | 26 October 2011, 23:13:31 UTC | Merge branch 'cn/eradicate-working-copy' into maint * cn/eradicate-working-copy: Remove 'working copy' from the documentation and C code | 26 October 2011, 23:13:31 UTC |
f0911b9 | Junio C Hamano | 26 October 2011, 23:13:27 UTC | 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' | 26 October 2011, 23:13:27 UTC |
8280baf | Junio C Hamano | 26 October 2011, 23:12:48 UTC | 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 | 26 October 2011, 23:12:48 UTC |
58f75bc | Junio C Hamano | 26 October 2011, 23:12:35 UTC | 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 | 26 October 2011, 23:12:35 UTC |
87d99c6 | Junio C Hamano | 26 October 2011, 23:12:25 UTC | 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 | 26 October 2011, 23:12:25 UTC |
716b64a | Junio C Hamano | 26 October 2011, 23:12:19 UTC | 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' | 26 October 2011, 23:12:19 UTC |
8371e91 | Junio C Hamano | 26 October 2011, 23:12:13 UTC | 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 | 26 October 2011, 23:12:13 UTC |
1f7a2ab | Junio C Hamano | 26 October 2011, 23:11:28 UTC | Merge branch 'hl/iso8601-more-zone-formats' into maint-1.7.6 * hl/iso8601-more-zone-formats: date.c: Support iso8601 timezone formats | 26 October 2011, 23:11:28 UTC |
411e6cf | Junio C Hamano | 26 October 2011, 23:09:28 UTC | 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 | 26 October 2011, 23:09:28 UTC |
588150b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'tr/doc-note-rewrite' into maint-1.7.6 * tr/doc-note-rewrite: Documentation: basic configuration of notes.rewriteRef | 26 October 2011, 23:09:04 UTC |
139088b | Junio C Hamano | 26 October 2011, 23:09:04 UTC | Merge branch 'nd/sparse-doc' into maint-1.7.6 * nd/sparse-doc: git-read-tree.txt: update sparse checkout examples | 26 October 2011, 23:09:04 UTC |
df9701e | Junio C Hamano | 26 October 2011, 23:09:03 UTC | 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 | 26 October 2011, 23:09:03 UTC |
a574c04 | Junio C Hamano | 26 October 2011, 23:08:19 UTC | 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' | 26 October 2011, 23:08:19 UTC |
69d61da | Junio C Hamano | 26 October 2011, 23:08:14 UTC | 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' | 26 October 2011, 23:08:14 UTC |
ed36a48 | Junio C Hamano | 26 October 2011, 23:08:08 UTC | 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' | 26 October 2011, 23:08:08 UTC |
eb4e672 | Junio C Hamano | 26 October 2011, 23:08:00 UTC | 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' | 26 October 2011, 23:08:00 UTC |
8f41c07 | René Scharfe | 24 October 2011, 01:01:27 UTC | read-cache.c: fix index memory allocation estimate_cache_size() tries to guess how much memory is needed for the in-memory representation of an index file. It does that by using the file size, the number of entries and the difference of the sizes of the on-disk and in-memory structs -- without having to check the length of the name of each entry, which varies for each entry, but their sums are the same no matter the representation. Except there can be a difference. First of all, the size is really calculated by ce_size and ondisk_ce_size based on offsetof(..., name), not sizeof, which can be different. And entries are padded with 1 to 8 NULs at the end (after the variable name) to make their total length a multiple of eight. So in order to allocate enough memory to hold the index, change the delta calculation to be based on offsetof(..., name) and round up to the next multiple of eight. On a 32-bit Linux, this delta was used before: sizeof(struct cache_entry) == 72 sizeof(struct ondisk_cache_entry) == 64 --- 8 The actual difference for an entry with a filename length of one was, however (find the definitions are in cache.h): offsetof(struct cache_entry, name) == 72 offsetof(struct ondisk_cache_entry, name) == 62 ce_size == (72 + 1 + 8) & ~7 == 80 ondisk_ce_size == (62 + 1 + 8) & ~7 == 64 --- 16 So eight bytes less had been allocated for such entries. The new formula yields the correct delta: (72 - 62 + 7) & ~7 == 16 Reported-by: John Hsing <tsyj2007@gmail.com> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:35:16 UTC |
c14daa4 | Jim Meyering | 22 October 2011, 17:44:40 UTC | 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> | 26 October 2011, 21:31:14 UTC |
e5b8eeb | Stefan Naewe | 26 October 2011, 19:13:09 UTC | completion: fix issue with process substitution not working on Git for Windows Git for Windows comes with a bash that doesn't support process substitution. It issues the following error when using git-completion.bash with GIT_PS1_SHOWUPSTREAM set: $ export GIT_PS1_SHOWUPSTREAM=1 sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": cannot make pipe for process substitution: Function not implemented sh.exe": <(git config -z --get-regexp '^(svn-remote\..*\.url|bash\.showupstream)$' 2>/dev/null | tr '\0\n' '\n '): ambiguous redirect Replace the process substitution with a 'here string'. Signed-off-by: Stefan Naewe <stefan.naewe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:05:47 UTC |
a80b263 | Ramsay Jones | 25 October 2011, 17:15:20 UTC | gitweb/Makefile: Remove static/gitweb.js in the clean target Since 9a86dd5 (gitweb: Split JavaScript for maintability, combining on build, 2011-04-28), static/gitweb.js has been a build product that should be cleaned upon "make clean". Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 21:03:58 UTC |
7641613 | Junio C Hamano | 26 October 2011, 19:15:51 UTC | builtin/grep: simplify lock_and_read_sha1_file() As read_sha1_lock/unlock have been made aware of use_threads, this caller can be made a lot simpler. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 20:09:23 UTC |
1487a12 | Junio C Hamano | 26 October 2011, 18:45:15 UTC | builtin/grep: make lock/unlock into static inline functions Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 20:09:04 UTC |
cdf0553 | Johannes Schindelin | 25 October 2011, 17:25:20 UTC | git grep: be careful to use mutexes only when they are initialized Rather nasty things happen when a mutex is not initialized but locked nevertheless. Now, when we're not running in a threaded manner, the mutex is not initialized, which is correct. But then we went and used the mutex anyway, which -- at least on Windows -- leads to a hard crash (ordinarily it would be called a segmentation fault, but in Windows speak it is an access violation). This problem was identified by our faithful tests when run in the msysGit environment. To avoid having to wrap the line due to the 80 column limit, we use the name "WHEN_THREADED" instead of "IF_USE_THREADS" because it is one character shorter. Which is all we need in this case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 October 2011, 18:35:49 UTC |
f384a2e | Junio C Hamano | 24 October 2011, 06:55:28 UTC | Merge branch 'maint' * maint: Reindent closing bracket using tab instead of spaces | 24 October 2011, 06:55:28 UTC |
982d1dc | Junio C Hamano | 24 October 2011, 06:55:22 UTC | Merge branch 'maint-1.7.3' into maint * maint-1.7.3: Reindent closing bracket using tab instead of spaces | 24 October 2011, 06:55:22 UTC |
c4c42f2 | Nguyễn Thái Ngọc Duy | 24 October 2011, 04:24:51 UTC | 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> | 24 October 2011, 06:54:58 UTC |
10b2a48 | Junio C Hamano | 24 October 2011, 04:49:14 UTC | 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 | 24 October 2011, 04:49:14 UTC |
f7d958d | Junio C Hamano | 24 October 2011, 04:48:06 UTC | Git 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 October 2011, 04:48:06 UTC |
7fe74f5 | Jonathan Nieder | 22 October 2011, 11:11:07 UTC | 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> | 24 October 2011, 04:16:31 UTC |
e454a83 | Junio C Hamano | 21 October 2011, 18:46:12 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 23:05:42 UTC |
9ee3d37 | Junio C Hamano | 21 October 2011, 23:04:37 UTC | Merge branch 'po/insn-editor' * po/insn-editor: "rebase -i": support special-purpose editor to edit insn sheet | 21 October 2011, 23:04:37 UTC |
0445ba2 | Junio C Hamano | 21 October 2011, 23:04:36 UTC | 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 | 21 October 2011, 23:04:36 UTC |
2f18b46 | Junio C Hamano | 21 October 2011, 23:04:36 UTC | 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() | 21 October 2011, 23:04:36 UTC |
470bbbc | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'jc/match-refs-clarify' * jc/match-refs-clarify: rename "match_refs()" to "match_push_refs()" send-pack: typofix error message | 21 October 2011, 23:04:35 UTC |
1020fbc | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'jc/make-tags' * jc/make-tags: Makefile: ask "ls-files" to list source files if available | 21 October 2011, 23:04:35 UTC |
8d3c0cb | Junio C Hamano | 21 October 2011, 23:04:35 UTC | Merge branch 'ss/inet-ntop' * ss/inet-ntop: inet_ntop.c: Work around GCC 4.6's detection of uninitialized variables | 21 October 2011, 23:04:35 UTC |
e335304 | Junio C Hamano | 21 October 2011, 23:04:34 UTC | Merge branch 'jc/maint-remove-renamed-ref' * jc/maint-remove-renamed-ref: branch -m/-M: remove undocumented RENAMED-REF Conflicts: refs.c | 21 October 2011, 23:04:34 UTC |
5a4fcc2 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | 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 | 21 October 2011, 23:04:33 UTC |
abe2773 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | Merge branch 'cn/doc-config-bare-subsection' * cn/doc-config-bare-subsection: Documentation: update [section.subsection] to reflect what git does | 21 October 2011, 23:04:33 UTC |
2070950 | Junio C Hamano | 21 October 2011, 23:04:33 UTC | 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 | 21 October 2011, 23:04:33 UTC |
e75a59a | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'jk/daemon-msgs' * jk/daemon-msgs: daemon: give friendlier error messages to clients Conflicts: daemon.c | 21 October 2011, 23:04:32 UTC |
1ad4b17 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | Merge branch 'sc/difftool-skip' * sc/difftool-skip: t7800: avoid arithmetic expansion notation git-difftool: allow skipping file by typing 'n' at prompt | 21 October 2011, 23:04:32 UTC |
b76c561 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | 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 | 21 October 2011, 23:04:32 UTC |
afd6284 | Junio C Hamano | 21 October 2011, 23:04:32 UTC | 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 | 21 October 2011, 23:04:32 UTC |
53c632f | Julien Muchembled | 21 October 2011, 19:04:21 UTC | 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> | 21 October 2011, 21:46:38 UTC |
cb9c9df | Jakub Narebski | 21 October 2011, 18:42:44 UTC | 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> | 21 October 2011, 21:34:08 UTC |
29eec71 | Jeff King | 21 October 2011, 17:30:21 UTC | completion: match ctags symbol names in grep patterns 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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 20:56:54 UTC |
21e4631 | Jeff King | 21 October 2011, 17:28:04 UTC | contrib: add git-jump script 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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 20:55:59 UTC |
8963314 | Junio C Hamano | 21 October 2011, 18:08:10 UTC | Sync with maint | 21 October 2011, 18:24:34 UTC |
8742218 | Junio C Hamano | 21 October 2011, 18:01:07 UTC | Almost ready for 1.7.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 October 2011, 18:01:07 UTC |
d25a265 | Junio C Hamano | 21 October 2011, 17:49:26 UTC | 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 | 21 October 2011, 17:49:26 UTC |
e63f87a | Junio C Hamano | 21 October 2011, 17:49:26 UTC | 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 | 21 October 2011, 17:49:26 UTC |
6e89b37 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | 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 | 21 October 2011, 17:49:25 UTC |
713b85c | Junio C Hamano | 21 October 2011, 17:49:25 UTC | 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 | 21 October 2011, 17:49:25 UTC |
689b047 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | Merge branch 'il/archive-err-signal' into maint * il/archive-err-signal: Support ERR in remote archive like in fetch/push | 21 October 2011, 17:49:25 UTC |
c510259 | Junio C Hamano | 21 October 2011, 17:49:25 UTC | 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" | 21 October 2011, 17:49:25 UTC |
cec3e18 | Junio C Hamano | 21 October 2011, 17:49:24 UTC | 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 | 21 October 2011, 17:49:24 UTC |
df68408 | Junio C Hamano | 21 October 2011, 17:49:24 UTC | 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 | 21 October 2011, 17:49:24 UTC |
634b29d | Junio C Hamano | 21 October 2011, 17:49:24 UTC | 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 | 21 October 2011, 17:49:24 UTC |
c1355b7 | Lénaïc Huard | 21 October 2011, 07:09:29 UTC | 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> | 21 October 2011, 17:18:37 UTC |
9e76d4a | Tay Ray Chuan | 21 October 2011, 13:49:36 UTC | 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> | 21 October 2011, 17:02:02 UTC |
1e42258 | Tay Ray Chuan | 21 October 2011, 13:49:35 UTC | 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> | 21 October 2011, 17:01:50 UTC |
6cf53d7 | Jeff King | 20 October 2011, 21:58:33 UTC | tests: add missing executable bits Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 October 2011, 23:52:28 UTC |
9fb7950 | Matthieu Moy | 20 October 2011, 17:04:59 UTC | 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> | 20 October 2011, 17:17:14 UTC |
5595635 | Junio C Hamano | 19 October 2011, 20:55:49 UTC | 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> | 19 October 2011, 20:58:15 UTC |
98ac34b | Junio C Hamano | 19 October 2011, 20:45:50 UTC | 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> | 19 October 2011, 20:58:15 UTC |
87009ed | Junio C Hamano | 19 October 2011, 05:03:30 UTC | Update draft release notes to 1.7.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2011, 18:02:13 UTC |
40d6987 | Brandon Casey | 19 October 2011, 16:26:02 UTC | 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> | 19 October 2011, 17:50:18 UTC |
3dfbe68 | Junio C Hamano | 19 October 2011, 17:49:27 UTC | Merge branch 'js/merge-edit-option' * js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c | 19 October 2011, 17:49:27 UTC |
9b55aa0 | Junio C Hamano | 19 October 2011, 17:49:13 UTC | 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() | 19 October 2011, 17:49:13 UTC |
662384c | Junio C Hamano | 19 October 2011, 17:49:09 UTC | 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 | 19 October 2011, 17:49:09 UTC |
541b9cf | Junio C Hamano | 19 October 2011, 17:49:05 UTC | 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 | 19 October 2011, 17:49:05 UTC |
2201cc8 | Junio C Hamano | 19 October 2011, 17:48:38 UTC | 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 | 19 October 2011, 17:48:38 UTC |
c31b87d | Junio C Hamano | 19 October 2011, 17:48:29 UTC | Merge branch 'jm/maint-apply-detects-corrupt-patch-header' * jm/maint-apply-detects-corrupt-patch-header: fix "git apply --index ..." not to deref NULL | 19 October 2011, 17:48:29 UTC |
e283548 | Junio C Hamano | 19 October 2011, 17:47:59 UTC | Merge branch 'jk/config-test-cleanup' * jk/config-test-cleanup: t1300: attempting to remove a non-existent .git/config is not an error | 19 October 2011, 17:47:59 UTC |
795290e | Johannes Sixt | 19 October 2011, 07:37:06 UTC | 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> | 19 October 2011, 17:11:42 UTC |
aadf863 | Junio C Hamano | 19 October 2011, 04:59:12 UTC | Merge branch 'js/log-show-children' * js/log-show-children: log --children | 19 October 2011, 04:59:12 UTC |
43a3b02 | Junio C Hamano | 19 October 2011, 04:59:11 UTC | Merge branch 'cb/httpd-test-fix-port' * cb/httpd-test-fix-port: use test number as port number | 19 October 2011, 04:59:11 UTC |
380f26c | Junio C Hamano | 19 October 2011, 04:59:11 UTC | 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 | 19 October 2011, 04:59:11 UTC |
578183b | Junio C Hamano | 19 October 2011, 04:59:11 UTC | 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 | 19 October 2011, 04:59:11 UTC |