- 16 5月, 2006 1 次提交
-
-
由 Junio C Hamano 提交于
A new flag "--cached" takes the cached data, applies the patch and stores the result in the index, without using the working tree. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 15 5月, 2006 8 次提交
-
-
由 Junio C Hamano 提交于
Somehow --stat showed the new name but --numstat showed the old name for renamed/copied paths. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: Ensure author & committer before asking for commit message.
-
由 Eric Wong 提交于
After 567ffeb7 and 4bc87a28, git-send-email no longer requires any non-standard Perl modules, so there's no reason to special-case it. Signed-off-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Eric Wong 提交于
mutt, gnus, pine, mailrc formats should be supported. Testing and feedback for correctness and completeness of all formats and support for additional formats would be good. Nested expansions are also supported. More than one alias file to be used. All alias file formats must still of be the same type, though. Two git repo-config keys are required for this (as suggested by Ryan Anderson): sendemail.aliasesfile = <filename of aliases file> sendemail.aliasfiletype = (mutt|gnus|pine|mailrc) Signed-off-by: NEric Wong <normalperson@yhbt.net> Acked-by: NRyan Anderson <ryan@michonline.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
When renaming leading/a/filename to leading/b/filename (and "filename" is sufficiently long), we tried to squash the rename to "leading/{a => b}/filename". However, when "/a" or "/b" part is empty, we underflowed and tried to print a substring of length -1. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Sean 提交于
It's better to find out you need to fix your author and committer information before you enter a long commit message. Signed-off-by: NSean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* fix: include header to define uint32_t, necessary on Mac OS X
-
由 Ben Clifford 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 14 5月, 2006 3 次提交
-
-
由 Junio C Hamano 提交于
* ml/cvs: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
-
由 Junio C Hamano 提交于
* fix: Fix git-pack-objects for 64-bit platforms
-
由 Dennis Stosberg 提交于
The offset of an object in the pack is recorded as a 4-byte integer in the index file. When reading the offset from the mmap'ed index in prepare_pack_revindex(), the address is dereferenced as a long*. This works fine as long as the long type is four bytes wide. On NetBSD/sparc64, however, a long is 8 bytes wide and so dereferencing the offset produces garbage. [jc: taking suggestion by Linus to use uint32_t] Signed-off-by: NDennis Stosberg <dennis@stosberg.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 11 5月, 2006 1 次提交
-
-
由 Nicolas Pitre 提交于
It cannot be assumed that the given buffer will never be moved when shrinking the allocated memory size with realloc(). So let's ignore that optimization for now. This patch makes Electric Fence happy on Linux. Signed-off-by: NNicolas Pitre <nico@cam.org> Acked-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 10 5月, 2006 11 次提交
-
-
由 Junio C Hamano 提交于
* fix: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge.
-
由 Junio C Hamano 提交于
After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Linus Torvalds 提交于
After doing an in-index 3-way merge, we always do the stock "merge-index merge-one-file" without doing anything fancy; use of --aggressive helps performance quite a bit. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
* jc/clean: Teach git-clean optional <paths>... parameters.
-
由 Junio C Hamano 提交于
* mw/alternates: clone: don't clone the info/alternates file test case for transitive info/alternates Transitively read alternatives
-
由 Junio C Hamano 提交于
* jc/xsha1: get_sha1() - fix infinite loop on nonexistent stage. get_sha1(): :path and :[0-3]:path to extract from index.
-
由 Junio C Hamano 提交于
* jc/again: Fix users of prefix_path() to free() only when necessary update-index --again: take optional pathspecs update-index --again
-
由 Junio C Hamano 提交于
* np/delta: improve diff-delta with sparse and/or repetitive data tiny optimization to diff-delta replace adler32 with Rabin's polynomial in diff-delta use delta index data when finding best delta matches split the diff-delta interface
-
由 Junio C Hamano 提交于
* jc/bindiff: improve base85 generated assembly code binary diff and apply: testsuite. binary diff: further updates. binary patch.
-
由 Junio C Hamano 提交于
* fix: read-cache.c: use xcalloc() not calloc() apply: fix infinite loop with multiple patches with --index
-
http://locke.catalyst.net.nz/git/git-martinlanghoff由 Junio C Hamano 提交于
* 'tojunio' of http://locke.catalyst.net.nz/git/git-martinlanghoff: Change to allow subdir updates from Eclipse Many fixes for most operations in Eclipse. Added logged warnings for CVS error returns cvsserver: use git-rev-list instead of git-log git-cvsexportcommit: Add -f(orce) and -m(essage prefix) flags, small cleanups.
-
- 09 5月, 2006 9 次提交
-
-
由 Yakov Lerner 提交于
Elsewhere we use xcalloc(); we should consistently do so. Signed-off-by: NYakov Lerner <iler.ml@gmail.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Eric Wong 提交于
When multiple patches are passed to git-apply, it will attempt to open multiple file descriptors to an index, which means multiple entries will be in the circular cache_file_list. This change makes git-apply only open the index once and write the index at exit. Signed-off-by: NEric Wong <normalperson@yhbt.net> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
When optional paths arguments are given, git-clean passes them to underlying git-ls-files; with this, you can say: git clean 'temp-*' to clean only the garbage files whose names begin with 'temp-'. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NPavel Roskin <proski@gnu.org>
-
由 Junio C Hamano 提交于
* fix: Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
-
由 Dmitry V. Levin 提交于
Separate object name errors from usage errors. Signed-off-by: NDmitry V. Levin <ldv@altlinux.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Nicolas Pitre 提交于
This code is arguably pretty hot, if you use binary patches of course. This patch helps gcc generate both smaller and faster code especially in the error free path. Signed-off-by: NNicolas Pitre <nico@cam.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Linus Torvalds 提交于
When we cut off the front of a filename to make it fit on the line, we add a "..." in front. However, the way the "git diff" code was written, we will never reset the prefix back to the empty string, so every single filename afterwards will have the "..." prefix, whether appropriate or not. You can see this with "git diff v2.6.16.." on the current kernel tree, since there are filenames with long names that changed there: [ snip snip ] Documentation/filesystems/vfs.txt | 229 .../firmware_class/firmware_sample_driver.c | 3 .../firmware_sample_firmware_class.c | 1 ...Documentation/fujitsu/frv/kernel-ABI.txt | 192 ...Documentation/hwmon/w83627hf | 4 [ snip snip ] notice how the two Documentation/firmware** filenames caused the "..." to be added, but then the later filenames don't want it, and it also screws up the alignment of the line numbering afterwards. Trivially fixed by moving the declaration (and initial setting) of the "prefix" variable into the for-loop where it is used. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 08 5月, 2006 7 次提交
-
-
由 Junio C Hamano 提交于
This hopefully fixes the problem an earlier commit 5d8ee9ce attemted to fix. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Martin Waitz 提交于
Now that the cloned alternates file is parsed, too we don't need to copy it into our new repository, we just reference it. Signed-off-by: NMartin Waitz <tali@admingilde.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Martin Waitz 提交于
Signed-off-by: NMartin Waitz <tali@admingilde.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Martin Waitz 提交于
When adding an alternate object store then add entries from its info/alternates files, too. Relative entries are only allowed in the current repository. Loops and duplicate alternates through multiple repositories are ignored. Just to be sure that nothing breaks it is not allow to build deep nesting levels using info/alternates. Signed-off-by: NMartin Waitz <tali@admingilde.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Martyn Smith 提交于
(Now you can rightclick any directory and select team-update/team-commit) and it should work
-
由 Junio C Hamano 提交于
* fix: repack: honor -d even when no new pack was created clone: keep --reference even with -l -s repo-config: document what value_regexp does a bit more clearly. Release config lock if the regex is invalid core-tutorial.txt: escape asterisk
-
由 Peter Hagervall 提交于
You gotta love sparse: builtin-diff.c:88:4: error: Just how const do you want this type to be? Signed-off-by: NPeter Hagervall <hager@cs.umu.se> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-