Skip to main content

Browse the archive

https://github.com/git/git
23 July 2024, 09:13:25 UTC
sort by:
Revision Author Date Message Commit Date
1e102bf Junio C Hamano 17 July 2008, 05:42:04 UTC mailinfo: off-by-one fix for [PATCH (foobar)] removal from Subject: line A patch title "[PATCH] 1" was sanitized by the original code by stripping the "[PATCH]" from the front, but after the conversion to use strbuf this behaviour was broken due to a counting error. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 05:42:04 UTC
3bf0dd1 Junio C Hamano 17 July 2008, 01:48:58 UTC read-cache.c: typofix Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 01:48:58 UTC
57cbf72 Junio C Hamano 17 July 2008, 01:34:19 UTC Update draft release notes for 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 01:34:19 UTC
1f8dc67 Junio C Hamano 17 July 2008, 00:49:59 UTC Merge branch 'mv/dashless' * mv/dashless: make remove-dashes: apply to scripts and programs as well, not just to builtins git-bisect: use dash-less form on git bisect log t1007-hash-object.sh: use quotes for the test description t0001-init.sh: change confusing directory name 17 July 2008, 00:49:59 UTC
0513f24 Junio C Hamano 17 July 2008, 00:49:53 UTC Merge branch 'ls/mailinfo' * ls/mailinfo: git-mailinfo: use strbuf's instead of fixed buffers Add some useful functions for strbuf manipulation. Make some strbuf_*() struct strbuf arguments const. Conflicts: builtin-mailinfo.c 17 July 2008, 00:49:53 UTC
e38953a Petr Baudis 16 July 2008, 18:44:12 UTC Documentation/git-submodule.txt: Add Description section Figuring out how submodules work conceptually is quite a bumpy ride for a newcomer; the user manual helps (if one knows to actually look into it), but the reference documentation should provide good quick intro as well. This patch attempts to do that, with suggestions from Heikki Orsila. Cc: Heikki Orsila <shdl@zakalwe.fi> Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 00:24:32 UTC
588c038 Junio C Hamano 17 July 2008, 00:22:50 UTC Merge branch 'sb/dashless' * sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh 17 July 2008, 00:22:50 UTC
e75bf76 Junio C Hamano 17 July 2008, 00:12:18 UTC Merge branch 'rs/archive' * rs/archive: archive: remove extra arguments parsing code archive: unify file attribute handling archive: centralize archive entry writing archive: add baselen member to struct archiver_args add context pointer to read_tree_recursive() archive: remove args member from struct archiver 17 July 2008, 00:12:18 UTC
1c7ac06 Junio C Hamano 17 July 2008, 00:12:11 UTC Merge branch 'ag/blame' * ag/blame: Do not try to detect move/copy for entries below threshold. Avoid rescanning unchanged entries in search for copies. 17 July 2008, 00:12:11 UTC
5324a63 Junio C Hamano 17 July 2008, 00:12:09 UTC Merge branch 'rs/rebase-checkout-not-so-quiet' * rs/rebase-checkout-not-so-quiet: git-rebase: report checkout failure Conflicts: git-rebase.sh 17 July 2008, 00:12:09 UTC
7ed3fed Junio C Hamano 17 July 2008, 00:11:18 UTC Merge branch 'sp/maint-index-pack' * sp/maint-index-pack: index-pack: Honor core.deltaBaseCacheLimit when resolving deltas index-pack: Track the object_entry that creates each base_data index-pack: Chain the struct base_data on the stack for traversal index-pack: Refactor base arguments of resolve_delta into a struct 17 July 2008, 00:11:18 UTC
88bbda0 Junio C Hamano 17 July 2008, 00:10:28 UTC Merge branch 'maint' * maint: Start preparing 1.5.6.4 release notes git fetch-pack: do not complain about "no common commits" in an empty repo rebase-i: keep old parents when preserving merges t7600-merge: Use test_expect_failure to test option parsing Fix buffer overflow in prepare_attr_stack Fix buffer overflow in git diff Fix buffer overflow in git-grep git-cvsserver: fix call to nonexistant cleanupWorkDir() Documentation/git-cherry-pick.txt et al.: Fix misleading -n description Conflicts: RelNotes 17 July 2008, 00:10:28 UTC
473a189 Junio C Hamano 16 July 2008, 22:55:51 UTC Start preparing 1.5.6.4 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 22:55:51 UTC
ebcce31 Johannes Schindelin 02 July 2008, 17:06:56 UTC git fetch-pack: do not complain about "no common commits" in an empty repo If the repo is empty, it is obvious that there are no common commits when fetching from _anywhere_. So there is no use in saying it in that case, and it can even be annoying. Therefore suppress the message unilaterally if the repository is empty prior to the fetch. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 22:53:43 UTC
013942f Junio C Hamano 16 July 2008, 22:27:03 UTC Merge branch 'js/maint-pretty-mailmap' into maint * js/maint-pretty-mailmap: Add pretty format %aN which gives the author name, respecting .mailmap 16 July 2008, 22:27:03 UTC
c9784cd Junio C Hamano 16 July 2008, 22:25:24 UTC Merge branch 'sp/maint-bash-completion-optim' into maint * sp/maint-bash-completion-optim: bash completion: Resolve git show ref:path<tab> losing ref: portion bash completion: Append space after file names have been completed bash completion: Don't offer "a.." as a completion for "a." bash completion: Improve responsiveness of git-log completion 16 July 2008, 22:25:24 UTC
bbe99ea Junio C Hamano 16 July 2008, 22:24:07 UTC Merge branch 'sp/maint-pack-memuse' into maint * sp/maint-pack-memuse: Correct pack memory leak causing git gc to try to exceed ulimit 16 July 2008, 22:24:07 UTC
614de95 Junio C Hamano 16 July 2008, 22:23:19 UTC Merge branch 'ls/maint-mailinfo-patch-label' into maint * ls/maint-mailinfo-patch-label: git-mailinfo: Fix getting the subject from the in-body [PATCH] line 16 July 2008, 22:23:19 UTC
2de3db2 Junio C Hamano 16 July 2008, 22:22:05 UTC Merge branch 'js/maint-daemon-syslog' into maint * js/maint-daemon-syslog: git daemon: avoid calling syslog() from a signal handler 16 July 2008, 22:22:05 UTC
1c5fa0a Stephan Beyer 16 July 2008, 01:51:49 UTC rebase-i: keep old parents when preserving merges When "rebase -i -p" tries to preserve merges of unrelated branches, it lost some parents: - When you have more than two parents, the commit in the new history ends up with fewer than expected number of parents and this breakage goes unnoticed; - When you are rebasing a merge with two parents and one is lost, the command tries to cherry-pick the original merge commit, and the command fails. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 22:13:53 UTC
01941bd Johannes Sixt 16 July 2008, 08:33:52 UTC t7600-merge: Use test_expect_failure to test option parsing It used plain 'if git merge ...', which hides a segfault. The test does not pass. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 21:27:09 UTC
f66cf96 Dmitry Potapov 16 July 2008, 15:39:55 UTC Fix buffer overflow in prepare_attr_stack If PATH_MAX on your system is smaller than a path stored in the git repo, it may cause the buffer overflow in prepare_attr_stack. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 21:05:50 UTC
fd55a19 Dmitry Potapov 16 July 2008, 14:54:02 UTC Fix buffer overflow in git diff If PATH_MAX on your system is smaller than a path stored, it may cause buffer overflow and stack corruption in diff_addremove() and diff_change() functions when running git-diff Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 21:03:24 UTC
620e2bb Dmitry Potapov 16 July 2008, 15:33:29 UTC Fix buffer overflow in git-grep If PATH_MAX on your system is smaller than any path stored in the git repository, that can cause memory corruption inside of the grep_tree function used by git-grep. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 20:30:34 UTC
dd33927 SungHyun Nam 16 July 2008, 01:31:28 UTC t/Makefile: use specified shell when running aggregation script Signed-off-by: SungHyun Nam <goweol@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:59:14 UTC
df4b3ab Lars Noschinski 16 July 2008, 11:35:46 UTC git-cvsserver: fix call to nonexistant cleanupWorkDir() git-cvsserver.perl contained a single call to a nonexistant function cleanupWorkDir(). This was obviously a typo for cleanupWorkTree(). Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:53:51 UTC
1121a87 Nanako Shiraishi 16 July 2008, 10:42:18 UTC parse-options.c: make check_typos() static This function is not used by any other file. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:50:36 UTC
cb2a1cc Nanako Shiraishi 16 July 2008, 10:42:14 UTC builtin-describe.c: make a global variable "pattern" static This variable is not used by any other file. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:50:32 UTC
7ba04d9 Nanako Shiraishi 16 July 2008, 10:42:10 UTC cache-tree.c: make cache_tree_find() static This function is not used by any other file. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:50:27 UTC
8bd867e Petr Baudis 16 July 2008, 12:35:22 UTC Documentation/git-cherry-pick.txt et al.: Fix misleading -n description The manual page of git-cherry-pick and git-revert asserts that -n works primarily on the working tree, while in fact the primary object it operates on is the index, and the changes only "accidentally" propagate to the working tree. This e.g. leads innocent #git IRC folks to believe that you can use -n to prepare changes for git-add -i staging. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:50:07 UTC
300072f Junio C Hamano 16 July 2008, 15:42:52 UTC t/aggregate-results: whitespace fix Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:42:52 UTC
3901a8c Eric Wong 14 July 2008, 09:13:56 UTC t/lib-git-svn: fix SVN_HTTPD tests to work with "trash directory" Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 15:11:15 UTC
fcab40a Junio C Hamano 16 July 2008, 02:09:46 UTC Merge branch 'mv/merge-in-c' * mv/merge-in-c: reduce_heads(): protect from duplicate input reduce_heads(): thinkofix Add a new test for git-merge-resolve t6021: add a new test for git-merge-resolve Teach merge.log to "git-merge" again Build in merge Fix t7601-merge-pull-config.sh on AIX git-commit-tree: make it usable from other builtins Add new test case to ensure git-merge prepends the custom merge message Add new test case to ensure git-merge reduces octopus parents when possible Introduce reduce_heads() Introduce get_merge_bases_many() Add new test to ensure git-merge handles more than 25 refs. Introduce get_octopus_merge_bases() in commit.c git-fmt-merge-msg: make it usable from other builtins Move read_cache_unmerged() to read-cache.c Add new test to ensure git-merge handles pull.twohead and pull.octopus Move parse-options's skip_prefix() to git-compat-util.h Move commit_list_count() to commit.c Move split_cmdline() to alias.c Conflicts: Makefile parse-options.c 16 July 2008, 02:09:46 UTC
c158cae Junio C Hamano 16 July 2008, 01:59:48 UTC Merge branch 'ag/rewrite_one' * ag/rewrite_one: Fix quadratic performance in rewrite_one. 16 July 2008, 01:59:48 UTC
223bb84 Junio C Hamano 16 July 2008, 01:59:45 UTC Merge branch 'sp/win' * sp/win: We need to check for msys as well as Windows in add--interactive. Convert CR/LF to LF in tag signatures Fixed text file auto-detection: treat EOF character 032 at the end of file as printable 16 July 2008, 01:59:45 UTC
1466080 Junio C Hamano 16 July 2008, 01:59:28 UTC Merge branch 'js/more-win' * js/more-win: help (Windows): Display HTML in default browser using Windows' shell API help.c: Add support for htmldir relative to git_exec_path() Move code interpreting path relative to exec-dir to new function system_path() 16 July 2008, 01:59:28 UTC
fab600c Junio C Hamano 16 July 2008, 01:59:04 UTC Merge branch 'js/maint-pretty-mailmap' * js/maint-pretty-mailmap: Add pretty format %aN which gives the author name, respecting .mailmap 16 July 2008, 01:59:04 UTC
28ed6e7 Johannes Schindelin 16 July 2008, 01:33:44 UTC Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge" Since the files generated and used during a rebase are never to be tracked, they should live in $GIT_DIR. While at it, avoid the rather meaningless term "dotest" to "rebase", and unhide ".dotest-merge". This was wished for on the mailing list, but so far unimplemented. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 July 2008, 01:49:28 UTC
1617fe9 Alexander Gavrilov 15 July 2008, 22:00:58 UTC Do not try to detect move/copy for entries below threshold. Splits for such entries are rejected anyway, so there is no point even trying to compute them. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 23:38:33 UTC
eb46328 Alexander Gavrilov 15 July 2008, 22:05:20 UTC Avoid rescanning unchanged entries in search for copies. Repeatedly comparing the same entry against the same set of blobs in search for copies is quite pointless. This huge waste of effort can be avoided using a flag in the blame_entry structure. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 23:38:32 UTC
6c11a5f Junio C Hamano 15 July 2008, 12:55:55 UTC Update draft release notes to 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:38:35 UTC
b526f8e Johannes Schindelin 14 July 2008, 18:08:52 UTC shortlog: support --pretty=format: option With this patch, the user can override the default setting, to print the commit messages using a user format instead of the onelines of the commits. Example: $ git shortlog --pretty='format:%s (%h)' <commit>.. Note that shortlog will only respect a user format setting, as the other formats do not make much sense. Wished for by Andrew Morton. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:37:00 UTC
1e5aaa6 Ciaran McCreesh 14 July 2008, 18:29:37 UTC Make git-add -i accept ranges like 7- git-add -i ranges expect number-number. But for the supremely lazy, typing in that second number when selecting "from patch 7 to the end" is wasted effort. So treat an empty second number in a range as "until the last item". Signed-off-by: Ciaran McCreesh <ciaran.mccreesh@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:37:00 UTC
a271b2a Pavel Roskin 15 July 2008, 00:20:19 UTC t9600: allow testing with cvsps 2.2, including beta versions We've supported cvsps 2.1 so far. Newer 2.2b1 (beta) seems to work with us, too. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:37:00 UTC
489e351 René Scharfe 14 July 2008, 19:22:05 UTC archive: remove extra arguments parsing code Replace the code that calls backend specific argument parsers by a simple flag mechanism. This reduces code size and complexity. We can add back such a mechanism (based on incremental parse_opt(), perhaps) when we need it. The compression level parameter, though, is going to be shared by future compressing backends like tgz. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:18:04 UTC
1d11d5b René Scharfe 14 July 2008, 19:22:29 UTC archive: unify file attribute handling Now that all file attribute handling for git archive has moved to archive.c, we can unexport sha1_file_to_archive() and is_archive_path_ignored() even disappears. Add setup_archive_check(), modelled after similar functions used in the code of other commands that support multiple file attributes. Also remove convert_to_archive(), as it's only remaining function with attribute handling gone was to call format_subst() if commit was not NULL, which is now checked in sha1_file_to_archive(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:18:04 UTC
562e25a René Scharfe 14 July 2008, 19:22:24 UTC archive: centralize archive entry writing Add the exported function write_archive_entries() to archive.c, which uses the new ability of read_tree_recursive() to pass a context pointer to its callback in order to centralize previously duplicated code. The new callback function write_archive_entry() does the work that every archiver backend needs to do: loading file contents, entering subdirectories, handling file attributes, constructing the full path of the entry. All that done, it calls the backend specific write_archive_entry_fn_t function. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:18:04 UTC
d53fe81 René Scharfe 15 July 2008, 07:49:38 UTC archive: add baselen member to struct archiver_args Calculate the length of base and save it in a new member of struct archiver_args. This way we don't have to compute it in each of the format backends. Note: parse_archive_args() guarantees that ->base won't ever be NULL. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:18:04 UTC
671f070 René Scharfe 14 July 2008, 19:22:12 UTC add context pointer to read_tree_recursive() Add a pointer parameter to read_tree_recursive(), which is passed to the callback function. This allows callers of read_tree_recursive() to share data with the callback without resorting to global variables. All current callers pass NULL. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:17:59 UTC
3453300 René Scharfe 15 July 2008, 07:49:40 UTC archive: remove args member from struct archiver Pass struct archiver and struct archiver_args explicitly to parse_archive_args and remove the latter from the former. This allows us to get rid of struct archiver_desc and simplifies the code a bit. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 14:08:11 UTC
92392b4 Shawn O. Pearce 15 July 2008, 04:45:34 UTC index-pack: Honor core.deltaBaseCacheLimit when resolving deltas If we are trying to resolve deltas for a long delta chain composed of multi-megabyte objects we can easily run into requiring 500M+ of memory to hold each object in the chain on the call stack while we recurse into the dependent objects and resolve them. We now use a simple delta cache that discards objects near the bottom of the call stack first, as they are the most least recently used objects in this current delta chain. If we recurse out of a chain we may find the base object is no longer available, as it was free'd to keep memory under the deltaBaseCacheLimit. In such cases we must unpack the base object again, which will require recursing back to the root of the top of the delta chain as we released that root first. The astute reader will probably realize that we can still exceed the delta base cache limit, but this happens only if the most recent base plus the delta plus the inflated dependent sum up to more than the base cache limit. Due to the way patch_delta is currently implemented we cannot operate in less memory anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 13:37:44 UTC
03993e1 Shawn O. Pearce 14 July 2008, 02:07:46 UTC index-pack: Track the object_entry that creates each base_data If we free the data stored within a base_data we need the struct object_entry to get the data back again for use with another dependent delta. Storing the object_entry* in base_data makes it simple to call get_data_from_pack() to recover the compressed information. This however means that we must add the missing base object to the end of our packfile prior to calling resolve_delta() on each of the dependent deltas. Adding the base first ensures we can read the base back from the pack we are indexing, as if it had been included by the remote side. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 13:36:49 UTC
4a438ca Shawn O. Pearce 14 July 2008, 02:07:45 UTC index-pack: Chain the struct base_data on the stack for traversal We need to release earlier inflated base objects when memory gets low, which means we need to be able to walk up or down the stack to locate the objects we want to release, and free their data. The new link/unlink routines allow inserting and removing the struct base_data during recursion inside resolve_delta, and the global base_cache gives us the head of the chain (bottom of the stack) so we can traverse it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 13:30:59 UTC
f41aebd Shawn O. Pearce 14 July 2008, 02:07:44 UTC index-pack: Refactor base arguments of resolve_delta into a struct We need to discard base objects which are not recently used if our memory gets low, such as when we are unpacking a long delta chain of a very large object. To support tracking the available base objects we combine the pointer and size into a struct. Future changes would allow the data pointer to be free'd and marked NULL if memory gets low. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 13:27:09 UTC
547905f Junio C Hamano 15 July 2008, 07:08:02 UTC Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: MERGE_RR lives in .git/ directly with newer Git versions git-gui: Exit shortcut in MacOSX repaired 15 July 2008, 07:08:02 UTC
ebcffb1 Junio C Hamano 15 July 2008, 06:48:48 UTC Merge branch 'js/merge-rr' * js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c 15 July 2008, 06:56:27 UTC
1864265 Junio C Hamano 15 July 2008, 06:47:48 UTC Merge branch 'sb/rerere-lib' * sb/rerere-lib: rerere: Separate libgit and builtin functions 15 July 2008, 06:47:48 UTC
abce32b Junio C Hamano 15 July 2008, 06:47:23 UTC Merge branch 'ls/maint-mailinfo-patch-label' * ls/maint-mailinfo-patch-label: git-mailinfo: Fix getting the subject from the in-body [PATCH] line 15 July 2008, 06:47:23 UTC
19792b2 Junio C Hamano 15 July 2008, 06:47:14 UTC Merge branch 'om/rerere-careful' * om/rerere-careful: builtin-rerere: more carefully find conflict markers 15 July 2008, 06:47:14 UTC
b773fc3 Junio C Hamano 15 July 2008, 06:47:01 UTC Merge branch 'jc/branch-merged' * jc/branch-merged: branch --merged/--no-merged: allow specifying arbitrary commit branch --contains: default to HEAD parse-options: add PARSE_OPT_LASTARG_DEFAULT flag Conflicts: Documentation/git-branch.txt 15 July 2008, 06:47:01 UTC
633ce9a Junio C Hamano 15 July 2008, 06:45:49 UTC Merge branch 'jc/rebase-orig-head' * jc/rebase-orig-head: Documentation: mention ORIG_HEAD in am, merge, and rebase Teach "am" and "rebase" to mark the original position with ORIG_HEAD 15 July 2008, 06:45:49 UTC
0557671 Shawn O. Pearce 15 July 2008, 05:58:06 UTC bash completion: Remove dashed command completion support Since only 'git' and 'gitk' are in the user's $PATH now we do not expect users to need completion support for git-fetch, and expect they will instead rely upon the completion support for 'git fetch'. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:37:42 UTC
3df6499 Junio C Hamano 15 July 2008, 06:36:08 UTC Merge branch 'sp/maint-bash-completion-optim' * sp/maint-bash-completion-optim: bash completion: Resolve git show ref:path<tab> losing ref: portion bash completion: Append space after file names have been completed 15 July 2008, 06:36:08 UTC
ac93910 Nicolas Pitre 15 July 2008, 01:46:48 UTC restore legacy behavior for read_sha1_file() Since commit 8eca0b47ff1598a6d163df9358c0e0c9bd92d4c8, it is possible for read_sha1_file() to return NULL even with existing objects when they are corrupted. Previously a corrupted object would have terminated the program immediately, effectively making read_sha1_file() return NULL only when specified object is not found. Let's restore this behavior for all users of read_sha1_file() and provide a separate function with the ability to not terminate when bad objects are encountered. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:32 UTC
25a1f37 Teemu Likonen 14 July 2008, 08:21:02 UTC bash: Add long option completion for 'git send-email' Add the following long options to be completed with 'git send-email': --bcc --cc --cc-cmd --chain-reply-to --compose --dry-run --envelope-sender --from --identity --in-reply-to --no-chain-reply-to --no-signed-off-by-cc --no-suppress-from --no-thread --quiet --signed-off-by-cc --smtp-pass --smtp-server --smtp-server-port --smtp-ssl --smtp-user --subject --suppress-cc --suppress-from --thread --to Short ones like --to and --cc are not usable for actual completion because of the shortness itself and because there are longer ones which start with same letters (--thread, --compose). It's still useful to have these shorter options _listed_ when user presses TAB key after typing two dashes. It gives user an idea what options are available (and --to and --cc are probably the most commonly used). Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:32 UTC
c2f9391 Mark Levedahl 10 July 2008, 01:05:41 UTC git-submodule - register submodule URL if adding in place When adding a new submodule in place, meaning the user created the submodule as a git repo in the superproject's tree first, we don't go through "git submodule init" to register the module. Thus, the submodule's origin repository URL is not stored in .git/config, and no subsequent submodule operation will ever do so. In this case, assume the URL the user supplies to "submodule add" is the one that should be registered, and do so. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:32 UTC
ec05df3 Mark Levedahl 10 July 2008, 01:05:40 UTC git-submodule - make "submodule add" more strict, and document it This change makes "submodule add" much more strict in the arguments it takes, and is intended to address confusion as recently noted on the git-list. With this change, the required syntax is: $ git submodule add URL path Specifically, this eliminates the form $ git submodule add URL which was confused by more than one person as $ git submodule add path With this patch, the URL locating the submodule's origin repository can be either an absolute URL, or (if it begins with ./ or ../) can express the submodule's repository location relative to the superproject's origin. This patch also eliminates a third form of URL, which was relative to the superproject's top-level directory (not its repository). Any URL that was neither absolute nor matched ./*|../* was assumed to point to a subdirectory of the superproject as the location of the submodule's origin repository. This URL form was confusing and does not seem to correspond to an important use-case. Specifically, no-one has identified the need to clone from a repository already in the superproject's tree, but if this is needed it is easily done using an absolute URL: $(pwd)/relative-path. So, no functionality is lost with this patch. (t6008-rev-list-submodule.sh did rely upon this relative URL, fixed by using $(pwd).) Following this change, there are exactly four variants of submodule-add, as both arguments have two flavors: URL can be absolute, or can begin with ./|../ and thus names the submodule's origin relative to the superproject's origin. Note: With this patch, "submodule add" discerns an absolute URL as matching /*|*:*: e.g., URL begins with /, or it contains a :. This works for all valid URLs, an absolute path in POSIX, as well as an absolute path on Windows). path can either already exist as a valid git repo, or will be cloned from the given URL. The first form here eases creation of a new submodule in an existing superproject as the submodule can be added and tested in-tree before pushing to the public repository. However, the more usual form is the second, where the repo is cloned from the given URL. This specifically addresses the issue of $ git submodule add a/b/c attempting to clone from a repository at "a/b/c" to create a new module in "c". This also simplifies description of "relative URL" as there is now exactly *one* form: a URL relative to the parent's origin repo. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:31 UTC
8f510be Frederik Schwarzer 14 July 2008, 16:30:24 UTC git-svn: typofix Signed-off-by: Frederik Schwarzer <schwarzerf@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:31 UTC
63c5602 João Abecasis 14 July 2008, 15:28:04 UTC git-svn: find-rev and rebase for SVN::Mirror repositories find-rev and rebase error out on svm because git-svn doesn't trace the original svn revision numbers back to git commits. The updated test case, included in the patch, shows the issue and passes with the rest of the patch applied. This fixes Git::SVN::find_by_url to find branches based on the svm:source URL, where useSvmProps is set. Also makes sure cmd_find_rev and working_head_info use the information they have to correctly track the source repository. This is enough to get find-rev and rebase working. Signed-off-by: João Abecasis <joao@abecasis.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:31 UTC
dc29bc8 Junio C Hamano 10 July 2008, 21:01:57 UTC tutorial: clarify "pull" is "fetch + merge" The document says that a fetch with a configured remote stores what are fetched in the remote tracking branches "Unlike the longhand form", but there is no longhand form "fetch" demonstrated earlier. This adds a missing demonstration of the longhand form, and a new paragraph to explain why some people might want to fetch before pull. Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:31 UTC
5d5e88a Ian Katz 10 July 2008, 18:27:30 UTC tutorial: use prompt with user names in example, to clarify who is doing what Signed-off-by: Ian Katz <ifreecarve@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:31 UTC
db8a9ff Shawn O. Pearce 15 July 2008, 05:52:04 UTC bash completion: Resolve git show ref:path<tab> losing ref: portion Linus reported that the bash completion for git show often dropped the ref portion of the argument (stuff before the :) when trying to complete a file name of a file in another branch or tag. Björn Steinbrink tracked it down to the gvfs completion script which comes standard on many Fedora Core based systems. That is removing : from COMP_WORDBREAKS, making readline treat the entire argument (including the ref) as the name that must be completed. When the git completion routines supplied a completion of just the filename, readline replaced everything. Since Git users often need to use "ref:path" or "ref:ref" sort of arguments, and expect completion support on both sides of the : we really want the : in COMP_WORDBREAKS to provide a good user experience. This is also the default that ships with bash as it can be useful in other contexts, such as rcp/scp. We now try to add : back to COMP_WORDBREAKS if it has been removed by a script that loaded before us. However if this doesn't work (as the : is stripped after we load) we fallback in the completion routines to include "ref:" as part of the prefix for completions, allowing readine to fully insert the argument the user wanted. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 15 July 2008, 06:35:18 UTC
324c2c3 Junio C Hamano 14 July 2008, 21:05:35 UTC git-rebase: report checkout failure When detaching the HEAD to the base commit, the "git checkout" command could fail if, for example, upstream contains a file that would overrwrite a local, untracked file. Unconditionally discarding the standard error stream was done to squelch the progress and notices back when checkout did not have -q option, but there is no reason to keep doing it anymore. Noticed by Robert Shearman. Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 21:05:35 UTC
711f6b2 Junio C Hamano 14 July 2008, 07:09:41 UTC reduce_heads(): protect from duplicate input Because we do not try computing merge base with itself for obvious reasons, the code was not prepared for an arguably insane case of the caller feeding the same commit twice to it. Noticed and test written by Sverre Hvammen Johansen Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 07:09:41 UTC
dc6282d Junio C Hamano 14 July 2008, 05:30:35 UTC Update draft release notes for 1.6.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 05:30:35 UTC
3b6121f Lukas Sandström 13 July 2008, 18:30:12 UTC git-mailinfo: use strbuf's instead of fixed buffers Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 02:10:48 UTC
778306e Shawn O. Pearce 14 July 2008, 00:22:03 UTC bash completion: Append space after file names have been completed When completing `git show origin/maint:Makef<tab>` we should add a space after the filename has been completed, so that the user can immediately begin the next argument. I also added a special case for the symlink variant so we treat it just like a normal blob, as there are no items below it in the Git tree structure. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 00:27:50 UTC
e9fe804 Lukas Sandström 10 July 2008, 21:41:33 UTC git-mailinfo: Fix getting the subject from the in-body [PATCH] line "Subject: " isn't in the static array "header", and thus memcmp("Subject:", header[i], 7) will never match. Even if it did so, hdr_data[] may not have been allocated if there weren't a "Subject: " in-body when we process "[PATCH]" in the affected codepath. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> 14 July 2008, 00:21:15 UTC
10ce020 Junio C Hamano 13 July 2008, 23:41:02 UTC Merge branch 'sp/maint-bash-completion-optim' * sp/maint-bash-completion-optim: bash completion: Don't offer "a.." as a completion for "a." bash completion: Improve responsiveness of git-log completion 13 July 2008, 23:41:02 UTC
6c36c9e Shawn O. Pearce 13 July 2008, 22:06:31 UTC bash completion: Don't offer "a.." as a completion for "a." If the user is trying to complete "v1.5.3.<tab>" to see all of the available maintenance releases for 1.5.3 we should not give them an extra dot as the completion. Instead if the user wants a ".." or a "..." operator they should key the two dots out on their own. Its the same number of keystrokes either way. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 23:40:23 UTC
7498205 Ramsay Jones 08 July 2008, 23:32:15 UTC git-request-pull: replace call to deprecated peek-remote Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 23:08:27 UTC
7970aaf Stephan Beyer 12 July 2008, 15:48:20 UTC Make rebase--interactive use OPTIONS_SPEC Also add some checks that --continue/--abort/--skip actions are used without --onto, -p, -t, etc. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 23:08:27 UTC
5352a82 Stephan Beyer 12 July 2008, 15:47:31 UTC t3404: test two "preserve merges with -p" cases There are two cases for preserving merges: 1. The merge base is outside the trunk that is to be rebased. Then commits of those other parents must not be picked. 2. The merge base is inside the trunk that is to be rebased. Then all the commits related to that merge must be picked and the merge must be redone. The "preserve merges with -p" test case tested for case 1 only. This patch adds case 2. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 23:08:27 UTC
356a32a Stephan Beyer 12 July 2008, 15:47:16 UTC git-am/git-mailsplit: correct synopsis for reading from stdin Invoking git-am or git-mailsplit without mbox or Maildir results in reading an mbox from stdin. Mention this in the synopsis and usage strings. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 23:08:27 UTC
447d0cc Junio C Hamano 13 July 2008, 22:45:38 UTC Merge branch 'maint' to sync with 1.5.6.3 * maint: GIT 1.5.6.3 git-am: Do not exit silently if committer is unset t0004: fix timing bug git-mailinfo: document the -n option Fix backwards-incompatible handling of core.sharedRepository 13 July 2008, 22:45:38 UTC
191a8e3 Junio C Hamano 13 July 2008, 22:23:43 UTC GIT 1.5.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 22:23:43 UTC
fa6200f Junio C Hamano 13 July 2008, 22:16:35 UTC Merge branch 'ph/parseopt-step-blame' * ph/parseopt-step-blame: revisions: refactor handle_revision_opt into parse_revision_opt. git-shortlog: migrate to parse-options partially. git-blame: fix lapsus git-blame: migrate to incremental parse-option [2/2] git-blame: migrate to incremental parse-option [1/2] revisions: split handle_revision_opt() from setup_revisions() parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option. parse-opt: fake short strings for callers to believe in. parse-opt: do not print errors on unknown options, return -2 intead. parse-opt: create parse_options_step. parse-opt: Export a non NORETURN usage dumper. parse-opt: have parse_options_{start,end}. git-blame --reverse builtin-blame.c: allow more than 16 parents builtin-blame.c: move prepare_final() into a separate function. rev-list --children revision traversal: --children option 13 July 2008, 22:16:35 UTC
671d322 Junio C Hamano 13 July 2008, 22:16:09 UTC Merge branch 'am/stash-branch' * am/stash-branch: Add a test for "git stash branch" Implement "git stash branch <newbranch> <stash>" 13 July 2008, 22:16:09 UTC
15fc1c0 Junio C Hamano 13 July 2008, 22:15:27 UTC Merge branch 'sg/stash-k-i' * sg/stash-k-i: Documentation: tweak use case in "git stash save --keep-index" stash: introduce 'stash save --keep-index' option 13 July 2008, 22:15:27 UTC
e636799 Junio C Hamano 13 July 2008, 22:15:23 UTC Merge branch 'jc/report-tracking' * jc/report-tracking: branch -r -v: do not spit out garbage stat_tracking_info(): clear object flags used during counting git-branch -v: show the remote tracking statistics git-status: show the remote tracking statistics Refactor "tracking statistics" code used by "git checkout" 13 July 2008, 22:15:23 UTC
fc062aa Junio C Hamano 13 July 2008, 22:15:13 UTC Merge branch 'js/pick-root' * js/pick-root: Allow cherry-picking root commits 13 July 2008, 22:15:13 UTC
ef567fe Junio C Hamano 13 July 2008, 22:15:08 UTC Merge branch 'ab/bundle' * ab/bundle: Teach git-bundle to read revision arguments from stdin like git-rev-list. 13 July 2008, 22:15:08 UTC
69b060c Junio C Hamano 13 July 2008, 22:14:59 UTC Merge branch 'tr/add-i-e' * tr/add-i-e: git-add--interactive: manual hunk editing mode git-add--interactive: remove hunk coalescing git-add--interactive: replace hunk recounting with apply --recount 13 July 2008, 22:14:59 UTC
f049e09 Johannes Schindelin 12 July 2008, 14:56:59 UTC git-gui: MERGE_RR lives in .git/ directly with newer Git versions Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete it somewhere else. Just in case somebody wants to use a newer git-gui with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if it exists). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> 13 July 2008, 21:58:40 UTC
4804aab Steffen Prohaska 13 July 2008, 20:31:20 UTC help (Windows): Display HTML in default browser using Windows' shell API The system's default browser for displaying HTML help pages is now used directly on Windows, instead of launching git-web--browser, which requires a Unix shell. Avoiding MSYS' bash when possible is good because it avoids potential path translation issues. In this case it is not too hard to avoid launching a shell, so let's avoid it. The Windows-specific code is implemented in compat/mingw.c to avoid platform-specific code in the main code base. On Windows, open_html is provided as a define. If open_html is not defined, git-web--browse is used. This approach avoids platform-specific ifdefs by using per-function ifdefs. The "ifndef open_html" together with the introductory comment should sufficiently warn developers, so that they hopefully will not break this mechanism. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 21:41:28 UTC
868da8d Steffen Prohaska 13 July 2008, 20:31:19 UTC help.c: Add support for htmldir relative to git_exec_path() If htmldir (in the Makefile) is a relative path, this path will now be interpreted relative to git_exec_path. This can be used to create an installation that can be moved to a different directory without re-compiling. The Windows installer (msysgit) is an example for such a setup. Note that the Makefile maps htmldir to the define GIT_HTML_PATH. Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 21:41:28 UTC
2de9de5 Steffen Prohaska 13 July 2008, 20:31:18 UTC Move code interpreting path relative to exec-dir to new function system_path() Expanding system paths relative to git_exec_path can be used for creating an installation that can be moved to a different directory without re-compiling. We use this approach for template_dir and the system wide gitconfig. The Windows installer (msysgit) is an example for such a setup. This commit moves common code to a new function system_path(). System paths that are to be interpreted relative to git_exec_path are passed to system_path() and the return value is used instead of the original path. system_path() prefixes a relative path with git_exec_path and leaves absolute paths unmodified. For example, we now write template_dir = system_path(DEFAULT_GIT_TEMPLATE_DIR); [j6t: moved from path.c to exec_cmd.c] Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 21:41:28 UTC
1b1dd23 Stephan Beyer 13 July 2008, 13:36:15 UTC Make usage strings dash-less When you misuse a git command, you are shown the usage string. But this is currently shown in the dashed form. So if you just copy what you see, it will not work, when the dashed form is no longer supported. This patch makes git commands show the dash-less version. For shell scripts that do not specify OPTIONS_SPEC, git-sh-setup.sh generates a dash-less usage string now. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 21:12:48 UTC
eacd6dc Lukas Sandström 13 July 2008, 18:29:18 UTC Add some useful functions for strbuf manipulation. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 21:04:04 UTC
9b200fd Lukas Sandström 13 July 2008, 18:28:24 UTC Make some strbuf_*() struct strbuf arguments const. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com> 13 July 2008, 20:59:34 UTC
back to top