summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* builtin-diff: call it "git-diff", really.Junio C Hamano2006-05-013-77/+4
| | | | | | | Call it "git diff" not "git diffn", remove the shell script version, and hardlink the git binary to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* builtin-diff.c: die() formatting type fix.Junio C Hamano2006-04-301-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* built-in diff: assorted updates.Junio C Hamano2006-04-294-26/+79
| | | | | | | | | | | | | | | | "git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>
* built-in diff.Junio C Hamano2006-04-284-1/+335
| | | | | | This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'fix'Junio C Hamano2006-04-2813-135/+178
|\ | | | | | | | | | | | | | | | | | | | | * fix: Fix trivial typo in git-log man page. Properly render asciidoc "callouts" in git man pages. Fix up remaining man pages that use asciidoc "callouts". Update the git-branch man page to include the "-r" option, annotate: display usage information if no filename was given annotate: fix warning about uninitialized scalar git-am --resolved: more usable error message.
| * Fix trivial typo in git-log man page.Sean Estabrooks2006-04-281-4/+3
| | | | | | | | Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * Properly render asciidoc "callouts" in git man pages.Sean Estabrooks2006-04-282-1/+17
| | | | | | | | | | | | | | | | Adds an xsl fragment to render docbook callouts when converting to man page format. Update the Makefile to have "xmlto" use it when generating man pages. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks2006-04-286-108/+104
| | | | | | | | | | | | | | | | | | Unfortunately docbook does not allow a callout to be referenced from inside a callout list description. Rewrite one paragraph in git-reset man page to work around this limitation. Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * Update the git-branch man page to include the "-r" option,Sean Estabrooks2006-04-282-19/+40
| | | | | | | | | | | | and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
| * annotate: display usage information if no filename was givenMatthias Kestenholz2006-04-281-3/+4
| | | | | | | | Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
| * annotate: fix warning about uninitialized scalarMatthias Kestenholz2006-04-281-0/+3
| | | | | | | | | | | | | | Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
| * git-am --resolved: more usable error message.Junio C Hamano2006-04-281-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | After doing the hard work of hand resolving the conflicts in the working tree, if the user forgets to run update-index to mark the paths that have been resolved, the command gave an unfriendly "fatal: git-write-tree: not able to write tree" error message. Catch the situation early and give more meaningful message and suggestion. Noticed and suggested by Len Brown. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'fix'Junio C Hamano2006-04-271-3/+3
|\ \ | |/ | | | | | | * fix: verify-pack: check integrity in a saner order.
| * verify-pack: check integrity in a saner order.Junio C Hamano2006-04-271-3/+3
| | | | | | | | | | | | | | | | Check internal integrity to report corrupt pack or idx, and then check cross-integrity between idx and pack. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'pb/config'Junio C Hamano2006-04-274-13/+30
|\ \ | | | | | | | | | | | | | | | | | | * pb/config: git-cvsserver: typofixes Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
| * | git-cvsserver: typofixesJunio C Hamano2006-04-251-8/+8
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Deprecate usage of git-var -l for getting config vars listPetr Baudis2006-04-242-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | This has been an unfortunate sideway in the git API evolution. We use git-repo-config for all the other .git/config interaction so let's also use git-repo-config -l for the variable listing. Signed-off-by: Petr Baudis <pasky@suse.cz>
| * | git-repo-config --list supportPetr Baudis2006-04-242-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | This adds git-repo-config --list (or git-repo-config -l) support, similar to what git-var -l does now (to be phased out so that we have a single sane interface to the config file instead of fragmented and confused API). Signed-off-by: Petr Baudis <pasky@suse.cz>
* | | Merge branch 'jc/diffstat'Junio C Hamano2006-04-271-4/+14
|\ \ \ | | | | | | | | | | | | | | | | * jc/diffstat: diff --stat: show complete rewrites consistently.
| * | | diff --stat: show complete rewrites consistently.Junio C Hamano2006-04-251-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch format shows complete rewrite as deletion of all old lines followed by addition of all new lines. Count lines consistenly with that when doing diffstat. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Fix "git help -a" terminal autosizingLinus Torvalds2006-04-272-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I split out the builtin commands into their own files, I left the include of <sys/ioctl.h> in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | diff-index: fix compilation warnings.Junio C Hamano2006-04-271-1/+0
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | t0000-basic: more commit-tree tests.Junio C Hamano2006-04-261-0/+28
| | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'fix'Junio C Hamano2006-04-266-25/+35
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * fix: commit-tree.c: check_valid() microoptimization. Fix filename verification when in a subdirectory rebase: typofix. socksetup: don't return on set_reuse_addr() error
| * | | commit-tree.c: check_valid() microoptimization.Junio C Hamano2006-04-261-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no point reading the whole object just to make sure it exists and it is of the expected type. We added sha1_object_info() for such need after this code was written, so use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Fix filename verification when in a subdirectoryLinus Torvalds2006-04-264-18/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we are in a subdirectory of a git archive, we need to take the prefix of that subdirectory into accoung when we verify filename arguments. Noted by Matthias Lederhofer This also uses the improved error reporting for all the other git commands that use the revision parsing interfaces, not just git-rev-parse. Also, it makes the error reporting for mixed filenames and argument flags clearer (you cannot put flags after the start of the pathname list). [jc: with fix to a trivial typo noticed by Timo Hirvonen] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | rebase: typofix.Junio C Hamano2006-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Noticed by Sean. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | socksetup: don't return on set_reuse_addr() errorv1.3.1Serge E. Hallyn2006-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)
* | | | commit-tree: allow generic object name for the tree as well.Junio C Hamano2006-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use get_sha1() for -p (parent) objects, but still used get_sha1_hex() for the tree. Just to be consistent, allow extended SHA1 expression for the tree object name. Note that this is not to encourage funky things like this: git-commit-tree HEAD^{tree} -p HEAD Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Makefile: remove and create xdiff library from scratch.Junio C Hamano2006-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... in the same spirit as 71459c193d04870076efa0a387c317390b53e3e2. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | t0000-basic: Add ls-tree recursive test back.Junio C Hamano2006-04-261-0/+21
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we updated ls-tree recursive output to omit the tree nodes, 246cc52f388cae8ca99e5a12b8458c9bfa467765 adjusted the old test so that we do not expect to see trees in its output. Later, with 0f8f45cb4a7e664b396f73c25891da46b953b8b8, we added back the ability to show both with -t option, but we forgot to update the test as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'jc/diff'Junio C Hamano2006-04-259-2136/+2111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/diff: Libified diff-index: backward compatibility fix. Libify diff-index. Libify diff-files.
| * | | Libified diff-index: backward compatibility fix.Junio C Hamano2006-04-223-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "diff-index -m" does not mean "do not ignore merges", but means "pretend missing files match the index". The previous round tried to address this, but failed because setup_revisions() ate "-m" flag before the caller had a chance to intervene. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Libify diff-index.Junio C Hamano2006-04-224-238/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second installment to libify diff brothers. The pathname arguments are checked more strictly than before because we now use the revision.c::setup_revisions() infrastructure. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Libify diff-files.Junio C Hamano2006-04-227-1953/+1929
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the first installment to libify diff brothers. The updated diff-files uses revision.c::setup_revisions() infrastructure to parse its command line arguments, which means the pathname arguments are checked more strictly than before. The tests are adjusted to separate possibly missing paths from the rest of arguments with double-dashes, to show the kosher way. As Linus pointed out, renaming diff.c to diff-lib.c was simply stupid, so I am renaming it back. The new diff-lib.c is to contain pieces extracted from diff brothers. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Makefile: remove and create libgit.a from scratch.Junio C Hamano2006-04-251-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Foolishly I renamed diff.o around which caused an old diff.o taken out of libgit.a and got linked into resulting binary and exhibited mysterious breakage for many people. This borrows from the kernel Makefile (scripts/Makefile.build) to first remove the target and then recreate. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'fix'Junio C Hamano2006-04-245-17/+212
|\ \ \ | | |/ | |/| | | | | | | | | | | | | * fix: Document the configuration file Document git-var -l listing also configuration variables rev-parse: better error message for ambiguous arguments
| * | Document the configuration filePetr Baudis2006-04-243-14/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: Petr Baudis <pasky@suse.cz>
| * | Document git-var -l listing also configuration variablesPetr Baudis2006-04-241-1/+4
| | | | | | | | | | | | Signed-off-by: Petr Baudis <pasky@suse.cz>
| * | rev-parse: better error message for ambiguous argumentsPaul Mackerras2006-04-241-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, if git-rev-parse encounters an argument that is neither a recognizable revision name nor the name of an existing file or directory, and it hasn't encountered a "--" argument, it prints an error message saying "No such file or directory". This can be confusing for users, including users of programs such as gitk that use git-rev-parse, who may then think that they can't ask about the history of files that no longer exist. This makes it print a better error message, one that points out the ambiguity and tells the user what to do to fix it. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | Merge branch 'ar/chmod-series'Junio C Hamano2006-04-241-7/+16
|\ \ \ | | | | | | | | | | | | | | | | * ar/chmod-series: make update-index --chmod work with multiple files and --stdin
| * | | make update-index --chmod work with multiple files and --stdinAlex Riesen2006-04-231-7/+16
| | |/ | |/| | | | | | | | | | | | | | | | | | | The patch makes "--chmod=-x" and "--chmod=+x" act like "--add" and "--remove" to affect the behaviour of the command for the rest of the path parameters, not just the following one. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'sh/daemon'Junio C Hamano2006-04-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * sh/daemon: socksetup: don't return on set_reuse_addr() error
| * | | socksetup: don't return on set_reuse_addr() errorSerge E. Hallyn2006-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/cc-stat'Junio C Hamano2006-04-241-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * jc/cc-stat: Fix "git show --stat"
| * | | | Fix "git show --stat"Junio C Hamano2006-04-211-1/+2
| | |/ / | |/| | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/unresolve'Junio C Hamano2006-04-241-0/+127
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * jc/unresolve: git-update-index --unresolve Add git-unresolve <paths>...
| * | | | git-update-index --unresolveJunio C Hamano2006-04-194-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>
| * | | | Add git-unresolve <paths>...Junio C Hamano2006-04-193-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>
* | | | | Merge branch 'jc/color'Junio C Hamano2006-04-242-0/+198
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/color: Add colordiff for git to contrib/colordiff.
View Lorry Controller Status