summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2006-05-02Merge branch 'fix'Junio C Hamano
* fix: git-send-email: fix version string to be valid perl Give the user a hint for how to continue in the case that git-am fails because it requires user intervention
2006-05-02git-send-email: fix version string to be valid perlMartin Langhoff
This makes git-send-email easier to develop and debug, skipping the need to `make git-send-email` every time. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Revert "fetch, pull: ask config for remote information"Junio C Hamano
This reverts 5a223a0d434c874984a0251eca4520ef95718a6d commit. I asked Johannes to roll an updated version, so let's wait for it.
2006-05-02repo-config: trim white-space before commentJohannes Schindelin
Earlier, calling git-repo-config core.hello on a .git/config like this: [core] hello = world ; a comment would yield "world " (i.e. with a trailing space). Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02repo-config: fix segfault with no argument.Johannes Schindelin
An earlier addition of --list feature was carelessly done and caused an invalid access to argv[1] when it was not given. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Give the user a hint for how to continue in the case that git-am fails ↵Robert Shearman
because it requires user intervention Give the user a hint for how to continue in the case that git-am fails because it requires user intervention. Signed-off-by: Robert Shearman <rob@codeweaves.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02gitk: Fix file list display when files are renamedPaul Mackerras
The conversion of the file list to use a text widget assumed incorrectly that the list of files from git-diff-tree -r would correspond 1-1 with the diff sections in the output of git-diff-tree -r -p -C, which is not true when renames are detected. This fixes it by keeping the elements in the difffilestart list in the order they appear in the file list window. Since this means that the elements of difffilestart are no longer necessarily in ascending order, it's somewhat hard to do the dynamic highlighting in the file list as the diff window is scrolled, so I have taken that out for now. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-02fetch, pull: ask config for remote informationJohannes Schindelin
Now you can say [remote.junio] url = git://git.kernel.org/pub/scm/git/git.git pull = next:next in your .git/config. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-push: also ask config for remote informationJohannes Schindelin
Now you can store your remote information in the config file like this: [remote.upstream] url = me@company.com:the-project push = master:iceballs [jc: fixed up to adjust a different fix for Push: lines earlier.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-push: make it official.Junio C Hamano
Remove the shell script version, and hardlink the git binary to it. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02show-branch: omit uninteresting merges.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-log/whatchanged/show: make them official.Junio C Hamano
Remove the shell script version, and hardlink the git binary to them. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02builtin-diff: call it "git-diff", really.Junio C Hamano
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>
2006-05-02builtin-count-objects: make it official.Junio C Hamano
Remove the shell-script version, make the hardlink from the git binary, and update the documentation to describe a new option. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-02Merge branch 'jc/xsha1-2'Junio C Hamano
* jc/xsha1-2: Extended SHA1 -- "rev^@" syntax to mean "all parents"
2006-05-02Merge branch 'jc/pack'Junio C Hamano
2006-05-02Merge branch 'jc/pathcheck'Junio C Hamano
* jc/pathcheck: revision parsing: make "rev -- paths" checks stronger.
2006-05-02Merge branch 'nh/fetch-http'Junio C Hamano
* nh/fetch-http: git-fetch: resolve remote symrefs for HTTP transport
2006-05-02Merge branch 'se/rebase'Junio C Hamano
* se/rebase: Add --continue and --abort options to git-rebase.
2006-05-02gitk: Basic support for highlighting one view within anotherPaul Mackerras
With this, one view can be used as a highlight for another, so that the commits that are in the highlight view are displayed in bold. This required some fairly major changes to how the list of ids, parents, children, and id to row mapping were stored for each view. We can now be reading in several views at once; for all except the current view, we just update the displayorder and the lists of parents and children for the view. This also creates a little bit of infrastructure for handling the watch cursor. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-05-01Use RFC2822 dates from "git fmt-patch".Junio C Hamano
Still Work-in-progress git fmt-patch (should it be known as format-patch-ng?) is matched with the fix made by Huw Davies in 262a6ef76a1dde97ab50d79fa5cd6d3f9f125765 commit to use RFC2822 date format. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-01Extended SHA1 -- "rev^@" syntax to mean "all parents"Junio C Hamano
A short-hand "rev^@" is understood to be "all parents of the named commit" with this patch. So you can do git show v1.0.0^@ to view the parents of a merge commit, gitk ^v1.0.0^@ v1.0.4 to view the log between two revs (including the bottom one), and git diff --cc v1.1.0 v1.0.0^@ to inspect what got changed from the merge parents of v1.0.0 to v1.1.0. This might be just my shiny new toy that is not very useful in practice. I needed it to do the multi-tree diff on Len's infamous 12-way Octopus; typing "diff --cc funmerge funmerge^1 funmerge^2 funmerge^3 ..." was too painful. [jc: taking suggestions from Linus and Johannes to match expectations from shell users who are used to see $@ or $* either of which makes sense. I tend to write "$@" more often so...] Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30gitk: Add a tree-browsing modePaul Mackerras
You can now select whether you want to see the patch for a commit or the whole tree. If you select the tree, gitk will now display the commit message plus the contents of one file in the bottom-left pane, when you click on the name of the file in the bottom-right pane. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-30Fix builtin-push to honor Push: lines in remotes file.Junio C Hamano
[jc: originally from Johannes Schindelin, but reworked to lift a hard limit of Push: lines] Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30builtin-push: resurrect parsing of Push: linesJohannes Schindelin
The C'ification of push left these behind. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30git builtin "push"Linus Torvalds
This adds a builtin "push" command, which is largely just a C'ification of the "git-push.sh" script. Now, the reason I did it as a built-in is partly because it's yet another step on relying less on shell, but it's actually mostly because I've wanted to be able to push to _multiple_ repositories, and the most obvious and simplest interface for that would seem be to just have a "remotes" file that has multiple URL entries. (For "pull", having multiple entries should either just select the first one, or you could fall back on the others on failure - your choice). And quite frankly, it just became too damn messy to do that in shell. Besides, we actually have a fair amount of infrastructure in C, so it just wasn't that hard to do. Of course, this is almost totally untested. It probably doesn't work for anything but the one trial I threw at it. "Simple" doesn't necessarily mean "obviously correct". Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30Merge branch 'fix'Junio C Hamano
* fix: git-format-patch: Use rfc2822 compliant date.
2006-04-30git-format-patch: Use rfc2822 compliant date.Huw Davies
Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-30builtin-diff.c: die() formatting type fix.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-29built-in diff: assorted updates.Junio C Hamano
"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>
2006-04-29built-in diff.Junio C Hamano
This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28Merge branch 'fix'Junio C Hamano
* 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.
2006-04-28Fix trivial typo in git-log man page.Sean Estabrooks
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28Properly render asciidoc "callouts" in git man pages.Sean Estabrooks
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>
2006-04-28Fix up remaining man pages that use asciidoc "callouts".Sean Estabrooks
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>
2006-04-28Update the git-branch man page to include the "-r" option,Sean Estabrooks
and fix up asciidoc "callouts" Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
2006-04-28annotate: display usage information if no filename was givenMatthias Kestenholz
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
2006-04-28annotate: fix warning about uninitialized scalarMatthias Kestenholz
Use of uninitialized value in scalar chomp at ./git-annotate.perl line 212, <$kid> chunk 4. Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch>
2006-04-28git-am --resolved: more usable error message.Junio C Hamano
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>
2006-04-28built-in count-objects.Junio C Hamano
Also it learned to do -v (verbose) to report: - number of loose objects - disk occupied by loose objects - number of objects in local packs - number of loose objects that are also in pack - unrecognised garbage in .git/objects/??/. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28pack-objects: update size heuristucs.Junio C Hamano
We used to omit delta base candidates that is much bigger than the target, but delta size does not grow when we delete more, so that was not a very good heuristics. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27Merge branch 'fix'Junio C Hamano
* fix: verify-pack: check integrity in a saner order.
2006-04-27verify-pack: check integrity in a saner order.Junio C Hamano
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>
2006-04-27Merge branch 'pb/config'Junio C Hamano
* pb/config: git-cvsserver: typofixes Deprecate usage of git-var -l for getting config vars list git-repo-config --list support
2006-04-27Merge branch 'jc/diffstat'Junio C Hamano
* jc/diffstat: diff --stat: show complete rewrites consistently.
2006-04-27Fix "git help -a" terminal autosizingLinus Torvalds
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>
2006-04-27gitk: Use a text widget for the file listPaul Mackerras
This lets us do things like highlighting all the entries for which the corresponding part of the diff is at least partly visible in the commit/patch display window, and in future it will let us display the file list in a hierarchical form rather than as a flat file list. Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-04-27diff-index: fix compilation warnings.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27t0000-basic: more commit-tree tests.Junio C Hamano
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-27git-fetch: resolve remote symrefs for HTTP transportNick Hengeveld
git-fetch validates that a remote ref resolves to a SHA1 prior to calling git-http-fetch. This adds support for resolving a few levels of symrefs to get to the SHA1. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>