summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-05-14Merge branch 'se/diff' into nextLibravatar Junio C Hamano6-6/+96
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
2006-05-14Merge branch 'se/rebase' into nextLibravatar Junio C Hamano3-13/+30
* se/rebase: Make git rebase interactive help match documentation.
2006-05-14Merge branch 'se/rev-parse' into nextLibravatar Junio C Hamano5-7/+48
* se/rev-parse: Add "--branches", "--tags" and "--remotes" options to git-rev-parse.
2006-05-14Merge branch 'lt/oneway' into nextLibravatar Junio C Hamano2-47/+5
* lt/oneway: Simplify "git reset --hard" Allow one-way tree merge to remove old files
2006-05-14Simplify "git reset --hard"Libravatar Linus Torvalds1-46/+4
Now that the one-way merge strategy does the right thing wrt files that do not exist in the result, just remove all the random crud we did in "git reset" to do this all by hand. Instead, just pass in "-u" to git-read-tree when we do a hard reset, and depend on git-read-tree to update the working tree appropriately. This basically means that git reset turns into # Always update the HEAD ref git update-ref HEAD "$rev" case "--soft" # do nothing to index/working tree case "--hard" # read index _and_ update working tree git-read-tree --reset -u "$rev" case "--mixed" # update just index, report on working tree differences git-read-tree --reset "$rev" git-update-index --refresh which is what it was always semantically doing, it just did it in a rather strange way because it was written to not expect git-read-tree to do anything to the working tree. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Allow one-way tree merge to remove old filesLibravatar Linus Torvalds1-1/+1
For some random reason (probably just because nobody noticed), the one-way merge strategy didn't mark deleted files as deleted, so if you used git-read-tree -m -u <newtree> it would update the files that got changed in the index, but it would not delete the files that got deleted. This should fix it, and I can't imagine that anybody depends on the old strange "update only existing files" behaviour. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Merge branch 'lt/diff' into nextLibravatar Junio C Hamano5-1/+55
* lt/diff: git diff: support "-U" and "--unified" options properly include header to define uint32_t, necessary on Mac OS X
2006-05-14Convert some "apply --summary" users to "diff --summary".Libravatar Sean3-4/+3
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Add "--summary" option to git diff.Libravatar Sean3-2/+93
Remove the need to pipe git diff through git apply to get the extended headers summary. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Make git rebase interactive help match documentation.Libravatar Sean3-13/+30
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14git diff: support "-U" and "--unified" options properlyLibravatar Linus Torvalds3-1/+53
We used to parse "-U" and "--unified" as part of the GIT_DIFF_OPTS environment variable, but strangely enough we would _not_ parse them as part of the normal diff command line (where we only accepted "-u"). This adds parsing of -U and --unified, both with an optional numeric argument. So now you can just say git diff --unified=5 to get a unified diff with a five-line context, instead of having to do something silly like GIT_DIFF_OPTS="--unified=5" git diff -u (that silly format does continue to still work, of course). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Add "--branches", "--tags" and "--remotes" options to git-rev-parse.Libravatar Sean5-7/+48
"git branch" uses "rev-parse --all" and becomes much too slow when there are many tags (it scans all refs). Use the new "--branches" option of rev-parse to speed things up. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Merge branch 'fix'Libravatar Junio C Hamano2-0/+2
* fix: include header to define uint32_t, necessary on Mac OS X
2006-05-14include header to define uint32_t, necessary on Mac OS XLibravatar Ben Clifford2-0/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-14Merge branch 'ml/cvs'Libravatar Junio C Hamano3-97/+187
* 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.
2006-05-13Merge branch 'fix'Libravatar Junio C Hamano2-2/+2
* fix: Fix git-pack-objects for 64-bit platforms
2006-05-13Merge branch 'lt/config' into nextLibravatar Junio C Hamano6-29/+93
* lt/config: git config syntax updates Another config file parsing fix. checkout: use --aggressive when running a 3-way merge (-m). Fix git-pack-objects for 64-bit platforms fix diff-delta bad memory access
2006-05-13Merge branch 'lt/fix-config' into lt/configLibravatar Junio C Hamano5-24/+93
* lt/fix-config: git config syntax updates Another config file parsing fix. checkout: use --aggressive when running a 3-way merge (-m). Fix git-pack-objects for 64-bit platforms with manual adjustment of t/t1300 for "git repo-config --list" option. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-13git config syntax updatesLibravatar Linus Torvalds3-20/+90
This updates the hierarchical section name syntax to [section<space>+"<randomstring>"] where the only rule for "randomstring" is that it can't contain a newline, and if you really want to insert a double-quote, you do it with \". It turns that into the section name "secion.randomstring". The "section" part is still case insensitive, but the "randomstring" part is case sensitive. So you could use this for things like [email "torvalds@osdl.org"] name = Linus Torvalds if you wanted to do the "email->name" conversion as part of the config file format (I'm not claiming that is sensible, I'm just giving it as an insane example). That would show up as the association email.torvalds@osdl.org.name -> Linus Torvalds which is easy to parse (the "." in the email _looks_ ambiguous, but it isn't: you know that there will always be a single key-name, so you find the key name with "strrchr(name, '.')" and things are entirely unambiguous). Repo-config is updated to be able to parse the new format, and also write things out in the new format. [jc: rolled two patches from Linus and one fix-up from Sean into one, with additional adjustments for t/t1300 test to check the case insensitiveness of section base and variable and case sensitiveness of the extended section part. Then stripped some part off to make the result applicable to the stale 1.3.X series that does not have recent enhancements. ] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-13Another config file parsing fix.Libravatar sean1-1/+3
If the variable we need to store should go into a section that currently only has a single variable (not matching the one we're trying to insert), we will already be into the next section before we notice we've bypassed the correct location to insert the variable. To handle this case we store the current location as soon as we find a variable matching the section of our new variable. This breakage was brought up by Linus. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-13checkout: use --aggressive when running a 3-way merge (-m).Libravatar Junio C Hamano1-1/+1
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: Junio C Hamano <junkio@cox.net>
2006-05-13Fix git-pack-objects for 64-bit platformsLibravatar Dennis Stosberg2-2/+2
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: Dennis Stosberg <dennis@stosberg.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-10fix diff-delta bad memory accessLibravatar Nicolas Pitre1-5/+0
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: Nicolas Pitre <nico@cam.org> Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09Merge branch 'master' into nextLibravatar Junio C Hamano4-12/+12
* master: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge. read-cache.c: use xcalloc() not calloc() apply: fix infinite loop with multiple patches with --index
2006-05-09Merge branch 'fix'Libravatar Junio C Hamano2-2/+2
* fix: checkout: use --aggressive when running a 3-way merge (-m). revert/cherry-pick: use aggressive merge.
2006-05-09checkout: use --aggressive when running a 3-way merge (-m).Libravatar Junio C Hamano1-1/+1
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: Junio C Hamano <junkio@cox.net>
2006-05-09revert/cherry-pick: use aggressive merge.Libravatar Linus Torvalds1-1/+1
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: Junio C Hamano <junkio@cox.net>
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-9/+37
* jc/grep: builtin-grep: -F (--fixed-strings) builtin-grep: -w fix builtin-grep: typofix
2006-05-09builtin-grep: -F (--fixed-strings)Libravatar Junio C Hamano2-5/+33
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09builtin-grep: -w fixLibravatar Junio C Hamano1-3/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09builtin-grep: typofixLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09Merge branch 'jc/clean'Libravatar Junio C Hamano2-5/+17
* jc/clean: Teach git-clean optional <paths>... parameters.
2006-05-09Merge branch 'mw/alternates'Libravatar Junio C Hamano3-77/+212
* mw/alternates: clone: don't clone the info/alternates file test case for transitive info/alternates Transitively read alternatives
2006-05-09Merge branch 'jc/xsha1'Libravatar Junio C Hamano1-8/+47
* jc/xsha1: get_sha1() - fix infinite loop on nonexistent stage. get_sha1(): :path and :[0-3]:path to extract from index.
2006-05-09Merge branch 'jc/again'Libravatar Junio C Hamano3-4/+142
* jc/again: Fix users of prefix_path() to free() only when necessary update-index --again: take optional pathspecs update-index --again
2006-05-09Merge branch 'np/delta'Libravatar Junio C Hamano5-157/+353
* 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
2006-05-09Merge branch 'jc/bindiff'Libravatar Junio C Hamano8-69/+575
* jc/bindiff: improve base85 generated assembly code binary diff and apply: testsuite. binary diff: further updates. binary patch.
2006-05-09Merge branch 'fix'Libravatar Junio C Hamano2-10/+10
* fix: read-cache.c: use xcalloc() not calloc() apply: fix infinite loop with multiple patches with --index
2006-05-09Merge branch 'jc/grep' into nextLibravatar Junio C Hamano1-26/+50
* jc/grep: builtin-grep: tighten argument parsing.
2006-05-09Merge branch 'ml/cvs' into nextLibravatar Junio C Hamano3-97/+187
* 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.
2006-05-09Merge branch 'tojunio' of ↵Libravatar Junio C Hamano3-97/+187
http://locke.catalyst.net.nz/git/git-martinlanghoff into ml/cvs * '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.
2006-05-09read-cache.c: use xcalloc() not calloc()Libravatar Yakov Lerner1-1/+1
Elsewhere we use xcalloc(); we should consistently do so. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-09apply: fix infinite loop with multiple patches with --indexLibravatar Eric Wong1-9/+9
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: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08builtin-grep: tighten argument parsing.Libravatar Junio C Hamano1-26/+50
I mistyped git grep next -e '"^@"' '*.c' and got many hits that contain "next" without complaint. Obviously what I meant to say was: git grep -e '"^@"' next -- '*.c' This tightens the argument parsing rule a bit: - All "grep" parameters should come first; - If there is no -e nor -f to specify pattern, the first non option string is the parameter; - After that, zero or more revs can follow. - An optional '--' can be present, and is skipped. - All the rest are pathspecs. If '--' was not there, they must be paths that exist in the working tree. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-08Merge branch 'jc/clean' into nextLibravatar Junio C Hamano18-46/+64
* jc/clean: Teach git-clean optional <paths>... parameters. 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.
2006-05-08Merge branch 'jc/bindiff' into nextLibravatar Junio C Hamano1-29/+35
* jc/bindiff: improve base85 generated assembly code
2006-05-08Merge branch 'jc/xsha1' into nextLibravatar Junio C Hamano1-0/+1
* jc/xsha1: get_sha1() - fix infinite loop on nonexistent stage.
2006-05-08Merge branch 'jc/grep' into nextLibravatar Junio C Hamano2-42/+104
* jc/grep: builtin-grep: documentation Teach -f <file> option to builtin-grep.
2006-05-08Teach git-clean optional <paths>... parameters.Libravatar Junio C Hamano2-5/+17
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: Junio C Hamano <junkio@cox.net> Signed-off-by: Pavel Roskin <proski@gnu.org>
2006-05-08Merge branch 'fix'Libravatar Junio C Hamano16-41/+47
* 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 01:45:45 +0000