summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-04-22Merge branch 'jc/cc-stat' into nextLibravatar Junio C Hamano1-1/+2
* jc/cc-stat: Fix "git show --stat"
2006-04-21Merge branch 'jc/color' into nextLibravatar Junio C Hamano3-0/+200
* jc/color: Add colordiff for git to contrib/colordiff. Makefile: dependency for builtin-help.o
2006-04-21Fix "git show --stat"Libravatar Junio C Hamano1-1/+2
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21Add colordiff for git to contrib/colordiff.Libravatar Junio C Hamano2-0/+198
I hacked it up to teach it the git extended diff headers, made it not to read the whole patch in the array. Also, the original program, when arguments are given, ran "diff" with the given arguments and showed the output from it. Of course, I changed it to run "git diff" ;-). Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21Merge branch 'jc/diff'Libravatar Junio C Hamano1-9/+68
* jc/diff: diff --stat: do not drop rename information.
2006-04-21Makefile: dependency for builtin-help.oLibravatar Junio C Hamano1-0/+2
builtin-help.c wants to include common-cmds.h which is a generated file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano6-342/+384
* jc/fmt-patch: Split up builtin commands into separate files from git.c git-log produces no output
2006-04-21Merge branch 'master' into jc/fmt-patchLibravatar Junio C Hamano20-369/+514
* master: Split up builtin commands into separate files from git.c git-log produces no output fix pack-object buffer size mailinfo: decode underscore used in "Q" encoding properly. Reintroduce svn pools to solve the memory leak. pack-objects: do not stop at object that is "too small" git-commit --amend: two fixes. get_tree_entry(): make it available from tree-walk sha1_name.c: no need to include diff.h; tree-walk.h will do. sha1_name.c: prepare to make get_tree_entry() reusable from others. get_sha1() shorthands for blob/tree objects pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance. diff: move diff.c to diff-lib.c to make room. git log: don't do merge diffs by default Allow "git repack" users to specify repacking window/depth Document git-clone --reference Fix filename scaling for binary files Fix uninteresting tags in new revision parsing Conflicts: Adjusted the addition of fmt-patch to match the recent split from git.c to builtin.log.c.
2006-04-21Split up builtin commands into separate files from git.cLibravatar Linus Torvalds5-305/+342
Right now it split it into "builtin-log.c" for log-related commands ("log", "show" and "whatchanged"), and "builtin-help.c" for the informational commands (usage printing and "help" and "version"). This just makes things easier to read, I find. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21Merge branch 'fix'Libravatar Junio C Hamano1-0/+2
* fix: git-log produces no output
2006-04-21git-log produces no outputLibravatar Linus Torvalds1-0/+2
When $PAGER is set to 'less -i', we used to fail because we assumed the $PAGER is a command and simply exec'ed it. Try exec first, and then run it through shell if it fails. This allows even funkier PAGERs like these ;-): PAGER='sed -e "s/^/`date`: /" | more' PAGER='contrib/colordiff.perl | less -RS' Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21Merge branch 'master' into nextLibravatar Junio C Hamano3-8/+12
* master: fix pack-object buffer size mailinfo: decode underscore used in "Q" encoding properly. Reintroduce svn pools to solve the memory leak. pack-objects: do not stop at object that is "too small"
2006-04-21Merge branch 'fix'Libravatar Junio C Hamano3-8/+12
* fix: fix pack-object buffer size mailinfo: decode underscore used in "Q" encoding properly. Reintroduce svn pools to solve the memory leak. pack-objects: do not stop at object that is "too small"
2006-04-21fix pack-object buffer sizeLibravatar Nicolas Pitre1-1/+1
The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also account for the space before the pathname, and the terminating \n and \0. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-21mailinfo: decode underscore used in "Q" encoding properly.Libravatar Junio C Hamano1-5/+7
Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are subtly different; the latter is used on the mail header and an underscore needs to be decoded to 0x20. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-20Reintroduce svn pools to solve the memory leak.Libravatar Santi_Béjar1-1/+3
Introduced in 4802426. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-20pack-objects: do not stop at object that is "too small"Libravatar Junio C Hamano1-1/+1
Because we sort the delta window by name-hash and then size, hitting an object that is too small to consider as a delta base for the current object does not mean we do not have better candidate in the window beyond it. Noticed by Shawn Pearce, analyzed by Nico, Linus and me. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-20Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano1-1/+1
* jc/fmt-patch: rename internal format-patch wip
2006-04-20rename internal format-patch wipLibravatar Junio C Hamano1-1/+1
Otherwise "git format-patch" would invoke unfinished internal one that does only --stdout Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-20Merge branch 'master' into nextLibravatar Junio C Hamano2-7/+16
* master: git-commit --amend: two fixes.
2006-04-20Merge branch 'fix'Libravatar Junio C Hamano2-7/+16
* fix: git-commit --amend: two fixes.
2006-04-20git-commit --amend: two fixes.Libravatar Junio C Hamano2-7/+16
When running "git commit --amend" only to fix the commit log message without any content change, we mistakenly showed the git-status output that says "nothing to commit" without commenting it out. If you have already run update-index but you want to amend the top commit, "git commit --amend --only" without any paths should have worked, because --only means "starting from the base commit, update-index these paths only to prepare the index to commit, and perform the commit". However, we refused -o without paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-20Stop carrying Geert's similarity estimator.Libravatar Junio C Hamano0-0/+0
I tried the code with pack-objects.c::try_delta(), and was somewhat dissapointed. The current type-path based heuristics already limits the delta attempts to similar objects anyway, so it is not a good place to apply it. The Net never forgets, so we can resurrect it if we wanted to later.
2006-04-19Merge branch 'jc/unresolve' into nextLibravatar Junio C Hamano4-149/+128
* jc/unresolve: git-update-index --unresolve
2006-04-19git-update-index --unresolveLibravatar Junio C Hamano4-149/+128
Retire git-unresolve and make it into "git-update-index --unresolve". It processes all paths that follow. During a merge, you would mark a path that is dealt with with: $ git update-index hello and you would "undo" it with: $ git update-index --unresolve hello Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Merge branch 'jc/diff' into nextLibravatar Junio C Hamano1-9/+68
* jc/diff: diff --stat: do not drop rename information.
2006-04-19diff --stat: do not drop rename information.Libravatar Junio C Hamano1-9/+68
When a verbatim rename or copy is detected, we did not show anything on the "diff --stat" for the filepair. This makes it to show the rename information. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano1-1/+1
* jc/fmt-patch: Minor tweak on subject line in --pretty=email
2006-04-19Merge branch 'jc/unresolve' into nextLibravatar Junio C Hamano11-63/+215
* jc/unresolve: Add git-unresolve <paths>... get_tree_entry(): make it available from tree-walk sha1_name.c: no need to include diff.h; tree-walk.h will do. sha1_name.c: prepare to make get_tree_entry() reusable from others. pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance. diff: move diff.c to diff-lib.c to make room. git log: don't do merge diffs by default Allow "git repack" users to specify repacking window/depth
2006-04-19Add git-unresolve <paths>...Libravatar Junio C Hamano3-1/+149
This is an attempt to address the issue raised on #git channel recently by Carl Worth. After a conflicted automerge, "git diff" shows a combined diff to give you how the tentative automerge result differs from what came from each branch. During a complex merge, it is tempting to be able to resolve a few paths at a time, mark them "I've dealt with them" with git-update-index to unclutter the next "git diff" output, and keep going. However, when the final result does not compile or otherwise found to be a mismerge, the workflow to fix the mismerged paths suddenly changes to "git diff HEAD -- path" (to get a diff from our HEAD before merging) and "git diff MERGE_HEAD -- path" (to get a diff from theirs), and it cannot show the combined anymore. With git-unresolve <paths>..., the versions from our branch and their branch for specified blobs are placed in stage #2 and stage #3, without touching the working tree files. This gives you the combined diff back for easier review, along with "diff --ours" and "diff --theirs". One thing it does not do is to place the base in stage #1; this means "diff --base" would behave differently between the run immediately after a conflicted three-way merge, and the run after an update-index by mistake followed by a git-unresolve. We could theoretically run merge-base between HEAD and MERGE_HEAD to find which tree to place in stage #1, but reviewing "diff --base" is not that useful so.... Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Merge branch 'lt/xsha1'Libravatar Junio C Hamano3-1/+67
* lt/xsha1: get_tree_entry(): make it available from tree-walk sha1_name.c: no need to include diff.h; tree-walk.h will do. sha1_name.c: prepare to make get_tree_entry() reusable from others. get_sha1() shorthands for blob/tree objects
2006-04-19Merge branch 'maint'Libravatar Junio C Hamano2-1/+4
* maint: pre-commit hook: complain about conflict markers. git-merge: a bit more readable user guidance.
2006-04-19diff: move diff.c to diff-lib.c to make room.Libravatar Junio C Hamano2-1/+1
Now I am not doing any real "git-diff in C" yet, but this would help before doing so. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19pre-commit hook: complain about conflict markers.Libravatar Junio C Hamano1-0/+3
Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19git-merge: a bit more readable user guidance.Libravatar Junio C Hamano1-1/+1
We said "fix up by hand" after failed automerge, which was a big "Huh? Now what?". Be a bit more explicit without being too verbose. Suggested by Carl Worth. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Minor tweak on subject line in --pretty=emailLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19get_tree_entry(): make it available from tree-walkLibravatar Junio C Hamano3-52/+52
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19sha1_name.c: no need to include diff.h; tree-walk.h will do.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19sha1_name.c: prepare to make get_tree_entry() reusable from others.Libravatar Junio C Hamano1-9/+10
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19git log: don't do merge diffs by defaultLibravatar Linus Torvalds1-2/+0
I personally prefer "ignore_merges" to be on by default, because quite often the merge diff is distracting and not interesting. That's true both with "-p" and with "--stat" output. If you want output from merges, you can trivially use the "-m", "-c" or "--cc" flags to tell that you're interested in merges, which also tells the diff generator what kind of diff to do (for --stat, any of the three will do, of course, but they differ for plain patches or for --patch-with-stat). This trivial patch just removes the two lines that tells "git log" not to ignore merges. It will still show the commit log message, of course, due to the "always_show_header" part. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Allow "git repack" users to specify repacking window/depthLibravatar Linus Torvalds1-3/+5
.. but don't even bother documenting it. I don't think any normal person is supposed to ever really care, but it simplifies testing when you want to use the "git repack" wrapper rather than forcing you to use the core programs (which already do support the window/depth arguments, of course). Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-19Merge branch 'master' into nextLibravatar Junio C Hamano2-4/+24
* master: Document git-clone --reference Fix filename scaling for binary files
2006-04-19Merge branch 'fix'Libravatar Junio C Hamano2-4/+24
* fix: Document git-clone --reference Fix filename scaling for binary files
2006-04-18Merge branch 'lt/xsha1' into nextLibravatar Junio C Hamano2-1/+67
* lt/xsha1: get_sha1() shorthands for blob/tree objects Fix uninteresting tags in new revision parsing
2006-04-18get_sha1() shorthands for blob/tree objectsLibravatar Linus Torvalds1-1/+66
This is a fairly straightforward patch to allow "get_sha1()" to also have shorthands for tree and blob objects. The syntax is very simple and intuitive: you can specify a tree or a blob by simply specifying <revision>:<path>, and get_sha1() will do the SHA1 lookup from the tree for you. You can currently do it with "git ls-tree <rev> <path>" and parsing the output, but that's actually pretty awkward. With this, you can do something like git cat-file blob v1.2.4:Makefile to get the contents of "Makefile" at revision v1.2.4. Now, this isn't necessarily something you really need all that often, but the concept itself is actually pretty powerful. We could, for example, allow things like git diff v0.99.6:git-commit-script..v1.3.0:git-commit.sh to see the difference between two arbitrary files in two arbitrary revisions. To do that, the only thing we'd have to do is to make git-diff-tree accept two blobs to diff, in addition to the two trees it now expects. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-18Fix uninteresting tags in new revision parsingLibravatar Linus Torvalds1-0/+1
When I unified the revision argument parsing, I introduced a simple bug wrt tags that had been marked uninteresting. When it was preparing for the revision walk, it would mark all the parent commits of an uninteresting tag correctly uninteresting, but it would forget about the commit itself. This means that when I just did my 2.6.17-rc2 release, and my scripts generated the log for "v2.6.17-rc1..v2.6.17-rc2", everything was fine, except the commit pointed to by 2.6.17-rc1 (which shouldn't have been there) was included. Even though it should obviously have been marked as being uninteresting. Not a huge deal, and the fix is trivial. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-18Document git-clone --referenceLibravatar Shawn Pearce1-1/+20
The new --reference flag introduced to git-clone in GIT 1.3.0 was not documented but is rather handy. So document it. Also corrected a minor issue with the documentation for the -s flag; the info/alternates file name was spelled wrong. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-18Merge branch 'jc/fmt-patch' into nextLibravatar Junio C Hamano4-13/+89
* jc/fmt-patch: Tentative built-in format-patch.
2006-04-18Tentative built-in format-patch.Libravatar Junio C Hamano4-13/+89
This only does --stdout right now. To write into separate files with pretty-printed filenames like the real thing does, it needs a bit mroe work. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-18Fix filename scaling for binary filesLibravatar Jonas Fonseca1-3/+4
Set maximum filename length for binary files so that scaling won't be triggered and result in invalid string access. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 11:20:23 +0000