Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
sort by:
Revision Author Date Message Commit Date
93310a4 Junio C Hamano 21 July 2008, 01:00:27 UTC Merge branch 'ap/trackinfo' * ap/trackinfo: Reword "your branch has diverged..." lines to reduce line length 21 July 2008, 01:00:27 UTC
d1f2e16 Junio C Hamano 21 July 2008, 01:00:17 UTC Merge branch 'jc/rerere-auto-more' * jc/rerere-auto-more: rerere.autoupdate: change the message when autoupdate is in effect 21 July 2008, 01:00:17 UTC
245648d Junio C Hamano 21 July 2008, 01:00:13 UTC Merge branch 'ns/am-abort' * ns/am-abort: git am --abort 21 July 2008, 01:00:13 UTC
378335b Junio C Hamano 21 July 2008, 00:53:17 UTC Merge branch 'jc/add-addremove' * jc/add-addremove: git-add --all: documentation git-add --all: tests git-add --all: add all files builtin-add.c: restructure the code for maintainability Conflicts: builtin-add.c 21 July 2008, 00:53:17 UTC
d14e740 Junio C Hamano 20 July 2008, 07:21:38 UTC "needs update" considered harmful "git update-index --refresh", "git reset" and "git add --refresh" have reported paths that have local modifications as "needs update" since the beginning of git. Although this is logically correct in that you need to update the index at that path before you can commit that change, it is now becoming more and more clear, especially with the continuous push for user friendliness since 1.5.0 series, that the message is suboptimal. After all, the change may be something the user might want to get rid of, and "updating" would be absolutely a wrong thing to do if that is the case. I prepared two alternatives to solve this. Both aim to reword the message to more neutral "locally modified". This patch is a more intrusive variant that changes the message for only Porcelain commands ("add" and "reset") while keeping the plumbing "update-index" intact. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 July 2008, 00:21:32 UTC
559e840 Junio C Hamano 20 July 2008, 23:13:05 UTC Move read_in_full() and write_in_full() to wrapper.c A few compat/* layer functions call these functions, but we would really want to keep them thin, without depending too much on the libgit proper. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 July 2008, 00:17:09 UTC
7df1709 Junio C Hamano 20 July 2008, 22:58:13 UTC Link shell with compat layer functions This in the short term will break on platforms that use compat implemenations that call outside compat layer, but that is exactly what we want. To give incentive to fix things for people who are affected and more importantly have environment to test their fixes. Signed-off-by: Junio C Hamano <gitster@pobox.com> 21 July 2008, 00:17:09 UTC
fa4946b Junio C Hamano 21 July 2008, 00:16:29 UTC Merge branch 'maint' * maint: fix usage string for git grep refresh-index: fix bitmask assignment Conflicts: builtin-grep.c 21 July 2008, 00:16:29 UTC
107cee5 Dmitry Potapov 20 July 2008, 20:14:07 UTC git-svn: fix git svn info to work without arguments commit 2fe403e7452bd6e1e8232445cf5434ce8f1af973 broke "git-svn info ." due to replacing '.' with '' in canonicalize_path for the top directory, while find_file_type_and_diff_status was not corrected. Bug reports: http://thread.gmane.org/gmane.comp.version-control.git/87822/ http://bugs.debian.org/490400 Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 22:16:50 UTC
c29c1b4 Michele Ballabio 20 July 2008, 12:02:20 UTC builtin-push.c: Cleanup - use OPT_BIT() and remove some variables Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 21:41:49 UTC
74f5b7f Michele Ballabio 20 July 2008, 12:34:47 UTC builtin-merge.c: Fix option parsing Now "git merge -m" needs a message, and errors out with the usage text if none is given. This way, t7600-merge.sh is fixed. Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 20:37:26 UTC
2d9c572 Jonathan Nieder 20 July 2008, 19:13:08 UTC fix usage string for git grep Without this patch, git-grep gives confusing usage information: $ git grep --confused usage: git grep <option>* <rev>* [-e] <pattern> [<path>...] $ git grep HEAD pattern fatal: ambiguous argument 'pattern': unknown revision or path no t in the working tree. Use '--' to separate paths from revisions So put <pattern> before the <rev>s, in accordance with actual correct usage. While we're changing the usage string, we might as well include the "--" separating revisions and paths, too. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 20:01:26 UTC
ec96224 Miklos Vajna 20 July 2008, 12:12:48 UTC Teach 'git merge' that some merge strategies no longer exist 'recur' co-existed with 'recursive' when rewriting it in C, but it no longer available. 'stupid' was also recently removed. "git merge -s confused origin" still includes them in the list of available merge strategies. [jc: this is a squash of two micropatches] Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 18:34:06 UTC
b0f2ecf Lars Noschinski 17 July 2008, 17:00:28 UTC cvsserver: Add testsuite for packed refs Check that req_update shows refs, even if all refs are packed. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 18:24:44 UTC
3f1b7b6 Junio C Hamano 20 July 2008, 06:25:00 UTC refresh-index: fix bitmask assignment 5fdeacb (Teach update-index about --ignore-submodules, 2008-05-14) added a new refresh option flag but did not assign a unique bit for it correctly, and broke "update-index --ignore-missing". This fixes it. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 07:00:46 UTC
da98053 Junio C Hamano 20 July 2008, 05:34:16 UTC git-add --all: documentation Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 06:08:58 UTC
340ce9e Junio C Hamano 20 July 2008, 03:32:38 UTC git-add --all: tests And here is a small test script that makes sure that: - both modified and new files are included, - removed file is noticed, and - no ignored file is included. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 06:08:58 UTC
3ba1f11 Junio C Hamano 20 July 2008, 02:51:11 UTC git-add --all: add all files People sometimes find that "git add -u && git add ." are 13 keystrokes too many. This reduces it by nine. The support of this has been very low priority for me personally, because I almost never do "git add ." in a directory with already tracked files, and in a new directory, there is no point saying "git add -u". However, for two types of people (that are very different from me), this mode of operation may make sense and there is no reason to leave it unsupported. That is: (1) If you are extremely well disciplined and keep perfect .gitignore, it always is safe to say "git add ."; or (2) If you are extremely undisciplined and do not even know what files you created, and you do not very much care what goes in your history, it does not matter if "git add ." included everything. So there it is, although I suspect I will not use it myself, ever. It will be too much of a change that is against the expectation of the existing users to allow "git commit -a" to include untracked files, and it would be inconsistent if we named this new option "-a", so the short option is "-A". We _might_ want to later add "git commit -A" but that is a separate topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 06:08:58 UTC
c972ec0 Junio C Hamano 20 July 2008, 02:22:25 UTC builtin-add.c: restructure the code for maintainability The implementation of "git add" has four major codepaths that are mutually exclusive: - if "--interactive" or "--patch" is given, spawn "git add--interactive" and exit without doing anything else. Otherwise things are handled internally in this C code; - if "--update" is given, update the modified files and exit without doing anything else; - if "--refresh" is given, do refresh and exit without doing anything else; - otherwise, find the paths that match pathspecs and stage their contents. It led to an unholy mess in the code structure; each of the latter three codepaths has a separate call to read_cache(), even though they are all about "read the current index, update it and write it back", and logically they should read the index once _anyway_. This cleans up the latter three cases by introducing a pair of helper variables: - "add_new_files" is set if we need to scan the working tree for paths that match the pathspec. This variable is false for "--update" and "--refresh", because they only work on already tracked files. - "require_pathspec" is set if the user must give at least one pathspec. "--update" does not need it but all the other cases do. This is in preparation for introducing a new option "--all", that does the equivalent of "git add -u && git add ." (aka "addremove"). Signed-off-by: Junio C Hamano <gitster@pobox.com> 20 July 2008, 06:08:58 UTC
09651dd Junio C Hamano 19 July 2008, 22:52:12 UTC Getting closer to 1.6.0-rc0 Update the links to "stale" versions of documentation to link to 1.5.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 22:52:12 UTC
3e5057a Nanako Shiraishi 16 July 2008, 10:39:10 UTC git am --abort After failing to apply patches in the middle of a series, "git am --abort" lets you go back to the original commit. [jc: doc/help update from Olivier, and fixups for "am -3" squashed in] Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 22:26:28 UTC
6796399 Junio C Hamano 19 July 2008, 18:28:06 UTC Merge branch 'maint' * maint: GIT 1.5.6.4 builtin-rm: fix index lock file path http-fetch: do not SEGV after fetching a bad pack idx file rev-list: honor --quiet option api-run-command.txt: typofix 19 July 2008, 18:28:06 UTC
03db452 Alexander Gavrilov 19 July 2008, 12:21:24 UTC Support gitlinks in fast-import. Currently fast-import/export cannot be used for repositories with submodules. This patch extends the relevant programs to make them correctly process gitlinks. Links can be represented by two forms of the Modify command: M 160000 SHA1 some/path which sets the link target explicitly, or M 160000 :mark some/path where the mark refers to a commit. The latter form can be used by importing tools to build all submodules simultaneously in one physical repository, and then simply fetch them apart. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:25:51 UTC
4a3fedd Junio C Hamano 19 July 2008, 06:24:26 UTC .mailmap update A few people sent in patches under slightly different spelling recently. Hopefully this catches most of them if not all (with help from Dscho). Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:25:51 UTC
c0be8aa Petr Baudis 19 July 2008, 18:17:22 UTC Documentation/git-merge.txt: Partial rewrite of How Merge Works The git-merge documentation's "HOW MERGE WORKS" section is confusingly composed and actually omits the most interesting part, the merging of the arguments into HEAD itself, surprisingly not actually mentioning the fast-forward merge anywhere. This patch replaces the "[NOTE]" screenful of highly technical details by a single sentence summing up the interesting information, and instead explains how are the arguments compared with HEAD and the three possible inclusion states that are named "Already up-to-date", "Fast-forward" and "True merge". It also makes it clear that the rest of the section talks only about the true merge situation, and slightly expands the talk on solving conflicts. Junio initiated the removal of the Note screenful altogether and offered many stylistical fixes. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:25:27 UTC
8575ea5 René Scharfe 18 July 2008, 14:30:47 UTC archive: remove unused headers Remove obsolete #includes. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
3a176c6 René Scharfe 18 July 2008, 14:30:32 UTC archive: make zip compression level independent from core git zlib_compression_level is the compression level used for git's object store. It's 1 by default, which is the fastest setting. This variable is also used as the default compression level for ZIP archives created by git archive. For archives, however, zlib's own default of 6 is more appropriate, as it's favouring small size over speed -- archive creation is not that performance critical most of the time. This patch makes git archive independent from git's internal compression level setting. It affects invocations of git archive without explicitly specified compression level option, only. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
6259ac6 Petr Baudis 18 July 2008, 14:11:07 UTC Documentation: How to ignore local changes in tracked files This patch explains more carefully that `.gitignore` concerns only untracked files and refers the reader to git update-index --assume-unchanged in the need of ignoring uncommitted changes in already tracked files. The description of this option is lifted to a more "porcelainish" level and explains the caveats of this usecase. Whether feasible or not, I believe adding this functionality to the porcelain is out of the scope of this patch. (And I personally think that referring to the plumbing in the case of such a special usage is fine.) This is currently probably one of the top FAQs at #git and the --assume-unchanged switch is not widely known; gitignore(5) is the first place where people are likely to look for it. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
c47f102 Petr Baudis 18 July 2008, 13:40:41 UTC Documentation/git-submodule.txt: Further clarify the description This patch rewrites the general description yet again, first clarifying the high-level concept, mentioning the difference to remotes and using the subtree merge strategy, then getting to the details about tree entries and .gitmodules file. The patch also makes few smallar grammar fixups within the rest of the description and clarifies how does 'init' relate to 'update --init'. Cc: Heikki Orsila <shdl@zakalwe.fi> Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
c09df8a Peter Harris 18 July 2008, 07:34:44 UTC Add ANSI control code emulation for the Windows console This adds only the minimum necessary to keep git pull/merge's diffstat from wrapping. Notably absent is support for the K (erase) operation, and support for POSIX write. Signed-off-by: Peter Harris <git@peter.is-a-geek.org> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
b8c5db3 Johannes Sixt 19 July 2008, 09:32:45 UTC builtin-clone: rewrite guess_dir_name() The function has to do three small and independent tasks, but all of them were crammed into a single loop. This rewrites the function entirely by unrolling these tasks. We also now use is_dir_sep(c) instead of c == '/' to increase portability. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
fe77b69 Eric Raible 18 July 2008, 07:34:42 UTC Teach lookup_prog not to select directories Without this simple fix "git gui" in the git source directory finds the git-gui directory instead of the tcl script in /usr/bin. Signed-off-by: Eric Raible <raible@gmail.com> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
42f7a2d Fabian Emmes 17 July 2008, 17:00:30 UTC testsuite for cvs co -c Check that all branches are displayed. Signed-off-by: Fabian Emmes <fabian.emmes@rwth-aachen.de> Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
89a9167 Lars Noschinski 17 July 2008, 17:00:29 UTC cvsserver: Add cvs co -c support Implement cvs checkout's -c option by returning a list of all "modules". This is more useful than displaying a perl warning if -c is given. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
b20171e Lars Noschinski 17 July 2008, 17:00:27 UTC cvsserver: Add support for packed refs req_update still parses /refs/heads manually. Replace this by a call to show-ref. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:43 UTC
374488f Fabian Emmes 17 July 2008, 17:00:26 UTC Testsuite: Unset CVS_SERVER The CVS_SERVER environment variable can cause some of the cvsimport tests to fail. So unset this variable at the beginning of the test script. Signed-off-by: Fabian Emmes <fabian.emmes@rwth-aachen.de> Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:42 UTC
7856844 Stephan Beyer 18 July 2008, 01:04:30 UTC Link git-shell only to a subset of libgit.a Commit 5b8e6f85 introduced stubs for three functions that make no sense for git-shell. But those stubs defined libgit.a functions a second time so that a linker can complain. Now git-shell is only linked to a subset of libgit.a. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:42 UTC
bb3e4f0 Junio C Hamano 18 July 2008, 06:18:43 UTC t9001 (send-email): Do not use hardcoded /bin/sh in test Scriptlets used form inside this test began with hardcoded "#!/bin/sh". By setting SHELL_PATH the user is already telling us that what the vendor has in /bin/sh isn't POSIX enough, and we really should try to honor that request. Originally noticed by SungHyun Nam who later tested this patch and verified that it fixes the issue on Solaris 9. Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 18:17:42 UTC
a1b6fb0 Junio C Hamano 19 July 2008, 17:58:01 UTC GIT 1.5.6.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 17:58:01 UTC
4d26467 Olivier Marin 19 July 2008, 16:24:46 UTC builtin-rm: fix index lock file path When hold_locked_index() is called with a relative git_dir and you are outside the work tree, the lock file become relative to the current directory. So when later setup_work_tree() change the current directory it breaks lock file path and commit_locked_index() fails. This patch move index locking code after setup_work_tree() call to make lock file relative to the working tree as it should be and add a test case. Noticed by Nick Andrew. Signed-off-by: Olivier Marin <dkr@freesurf.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> 19 July 2008, 17:41:17 UTC
fcf74db Junio C Hamano 18 July 2008, 22:39:51 UTC Merge branch 'sp/maint-index-pack' into maint * 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 18 July 2008, 22:39:51 UTC
a70c232 Junio C Hamano 18 July 2008, 07:11:40 UTC http-fetch: do not SEGV after fetching a bad pack idx file Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 July 2008, 07:11:40 UTC
d85fe38 Junio C Hamano 18 July 2008, 05:39:09 UTC rev-list: honor --quiet option Nick Andrew noticed that rev-list lets --quiet option to be parsed by underlying diff_options parser but did not pick up the result. This resulted in --quiet option to become effectively a no-op. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 July 2008, 06:36:16 UTC
72972eb Junio C Hamano 18 July 2008, 04:30:33 UTC builtin-remote.c: fix earlier "skip_prefix()" conversion The original code relied on an insane definition of skip_prefix() that returned an empty string for a NULL input and returned the original if the given "prefix" is not a prefix at all (it would have been justifiable if it were called "come_up_with_a_short_name_to_report_ref()" or something, though). In any case, when we replaced it with a more saner definition of the function whose behaviour is true to its name, its callers needed to be adjusted but the conversion missed one call site. This introduces a helper function "abbrev_ref()" whose purpose is to get a full refname and its possible prefix and to strip the prefix part if it matches, or refname itself in full if it doesn't. This makes the callers easier to read again. Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 July 2008, 05:13:19 UTC
6c69207 Stephan Beyer 17 July 2008, 23:53:55 UTC api-run-command.txt: typofix Replace "run_command_v_opt_dir" by "run_command_v_opt_cd". Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 18 July 2008, 03:50:06 UTC
1b76ead Petr Baudis 17 July 2008, 17:01:30 UTC Documentation/RelNotes-1.6.0.txt: Expand on the incompatible packfiles Note that v1.4.4.5 supports pack index v2, and describe how to keep your repositories backwards-compatible, shall you need to. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 18:19:39 UTC
9196e82 Junio C Hamano 17 July 2008, 03:25:18 UTC rerere.autoupdate: change the message when autoupdate is in effect This changes the message rerere issues after reusing previous conflict resolution from "Resolved" to "Staged" when autoupdate option is in effect. It is envisioned that in practice, some auto resolitions are trickier and iffier than others, and we would want to add a feature to mark individual resolutions as "this is ok to autoupdate" or "do not autoupdate the result using this resolution even when rerere.autoupdate is in effect" in the future. When that happens, these messages will make the distinction clearer. Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 06:32:33 UTC
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
4de53ce Avery Pennarun 16 July 2008, 19:19:27 UTC Reword "your branch has diverged..." lines to reduce line length The message length depends on the length of the branch name. In my case, the branch name "origin/add-chickens2" put the first line of the "your branch has diverged" message over 80 characters, which triggered "less -FS" to not exit automatically as expected. This patch rewords the messages to make the lines generally shorter, so that you'd need a significantly longer branch name to trigger the problem. Signed-off-by: Avery Pennarun <apenwarr@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 July 2008, 00:56:59 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
back to top