summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-06-08Merge branch 'pe/date' into nextLibravatar Junio C Hamano7-18/+41
* pe/date: date.c: improve guess between timezone offset and year. git-rm: honor -n flag. git-clone: fix duplicated "master" in $GIT_DIR/remotes/origin check for error return from fork() Document git-clone --use-separate-remote
2006-06-08date.c: improve guess between timezone offset and year.Libravatar Paul Eggert1-1/+1
When match_digit() guesses a four-digit string to tell if it is a year or a timezone, it did not consider that some real-world places have UTC offsets equal to +1400. $ date; TZ=UTC0 date; TZ=Pacific/Kiritimati date Wed Jun 7 23:25:42 PDT 2006 Thu Jun 8 06:25:42 UTC 2006 Thu Jun 8 20:25:42 LINT 2006 Signed-off-by: Paul Eggert <eggert@CS.UCLA.EDU> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08git-rm: honor -n flag.Libravatar Junio C Hamano1-7/+10
Even when invoked with -n flag, git-rm removed the matching paths anyway. Also includes the missing check spotted by SungHyun Nam, which caused it to segfault. Now we refuse to run without any paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08git-clone: fix duplicated "master" in $GIT_DIR/remotes/originLibravatar Junio C Hamano1-5/+10
Under --use-separate-remote we ended up duplicating the branch remote HEAD pointed at in $GIT_DIR/remotes/origin file. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08check for error return from fork()Libravatar Paul T Darga3-2/+12
Trivial fixup for fork() callsites which do not check for errors. Signed-off-by: Paul T Darga <pdarga@umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-08Document git-clone --use-separate-remoteLibravatar Uwe Zeisberger1-3/+8
Signed-off-by: Uwe Zeisberger <uzeisberger@io.fsforth.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Merge branch 'master' into nextLibravatar Junio C Hamano1-2/+14
* master: Documentation: add another example to git-ls-files
2006-06-07Documentation: add another example to git-ls-filesLibravatar Junio C Hamano1-2/+14
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Merge branch 'master' into nextLibravatar Junio C Hamano21-52/+193
* master: Documentation: git aliases git-cvsserver asciidoc formatting tweaks config.txt grammar, typo, and asciidoc fixes Documentation: git-ls-tree (typofix) Document git-ls-tree --fullname Document git aliases support make clean: remove dist-doc targets. Misc doc improvements Documentation: add missing docs make check-docs found. Some doc typo fixes Off-by-one error in get_path_prefix(), found by Valgrind gitk: Re-read the descendent/ancestor tag & head info on update
2006-06-07Documentation: git aliasesLibravatar Petr Baudis1-3/+4
Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07git-cvsserver asciidoc formatting tweaksLibravatar Francis Daly1-18/+31
No content change here. html output improved. man output changed. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07config.txt grammar, typo, and asciidoc fixesLibravatar Francis Daly1-9/+9
Nothing major. Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: git-ls-tree (typofix)Libravatar Junio C Hamano1-1/+1
spotted by jdl. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Document git-ls-tree --fullnameLibravatar Jonas Fonseca1-4/+7
Additionally, reformat synopsis and remove stub notice. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Document git aliases supportLibravatar Petr Baudis2-0/+11
This patch ports and modifies appropriately the git aliases documentation from my patch, shall it rest in peace. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07make clean: remove dist-doc targets.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Misc doc improvementsLibravatar Jonas Fonseca3-4/+24
Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Documentation: add missing docs make check-docs found.Libravatar Junio C Hamano3-1/+76
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Some doc typo fixesLibravatar Francis Daly10-13/+14
All should be clear enough, except perhaps committish / commitish. I just kept the more-used one within the current docs. [jc: with rephrasing of check-ref-format description later discussed on the list] Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07Off-by-one error in get_path_prefix(), found by ValgrindLibravatar Rene Scharfe1-1/+2
[jc: original fix was done by Pavel and this contains improvements by Rene.] Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano1-384/+1094
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Re-read the descendent/ancestor tag & head info on update gitk: Show branch name(s) as well, if "show nearby tags" is enabled gitk: Show nearby tags gitk: Add a goto next/previous highlighted commit function gitk: Provide ability to highlight based on relationship to selected commit gitk: Fix bug in highlight stuff when no line is selected gitk: Move "pickaxe" find function to highlight facility gitk: Improve the text window search function gitk: First cut at a search function in the patch/file display window gitk: Highlight paths of interest in tree view as well gitk: Highlight entries in the file list as well gitk: Make a row of controls for controlling highlighting
2006-06-06Merge branch 'master' into nextLibravatar Junio C Hamano4-20/+52
* master: http-fetch: fix possible segfault Refactor git_tcp_connect() functions a little. builtin-grep: pass ignore case option to external grep
2006-06-06http-fetch: fix possible segfaultLibravatar Nick Hengeveld1-0/+1
Initialize an object request's slot to a safe value. A non-NULL value can cause a segfault if the request is aborted before it starts. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Refactor git_tcp_connect() functions a little.Libravatar Jon Loeliger2-20/+49
Add client side sending of "\0host=%s\0" extended arg for git native protocol, backwards compatibly. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Merge branch 'jc/lockfile'Libravatar Junio C Hamano14-120/+127
* jc/lockfile: ref-log: style fixes. refs.c: convert it to use lockfile interface. Make index file locking code reusable to others.
2006-06-06Merge branch 'js/alias'Libravatar Junio C Hamano1-4/+123
* js/alias: git alias: try alias last. If you have a config containing something like this:
2006-06-06Merge branch 'vb/sendemail'Libravatar Junio C Hamano1-8/+7
* vb/sendemail: send-email: a bit more careful domain regexp. send-email: be more lenient and just catch obvious mistakes. Cleanup git-send-email.perl:extract_valid_email
2006-06-06builtin-grep: pass ignore case option to external grepLibravatar Robert Fitzsimons1-0/+2
Don't just read the --ignore-case/-i option, pass the flag on to the external grep program. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-07gitk: Re-read the descendent/ancestor tag & head info on updateLibravatar Paul Mackerras1-1/+17
Signed-off-by: Paul Mackerras <paulus@samba.org>
2006-06-06Merge branch 'jc/lockfile' into nextLibravatar Junio C Hamano18-168/+196
* jc/lockfile: ref-log: style fixes. refs.c: convert it to use lockfile interface. Make index file locking code reusable to others. HTTP cleanup HTTP cleanup git-format-patch: add --output-directory long option again
2006-06-06Merge branch 'vb/sendemail' into nextLibravatar Junio C Hamano1-1/+1
* vb/sendemail: send-email: a bit more careful domain regexp.
2006-06-06ref-log: style fixes.Libravatar Junio C Hamano3-13/+18
A few style fixes to get the code in line with the rest. - asterisk to make a type a pointer to something goes in front of the variable, not at the end of the base type. E.g. a pointer to an integer is "int *ip", not "int* ip". - open parenthesis for function parameter list, unlike syntactic constructs, comes immediately after the function name. E.g. "if (foo) bar();" not "if(foo) bar ();". - "else" does not come on the same line as the closing brace of corresponding "if". The style is mostly a matter of personal taste, and people may disagree, but consistency is important. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06refs.c: convert it to use lockfile interface.Libravatar Junio C Hamano2-12/+11
This updates the ref locking code to use creat-rename locking code we use for the index file, so that it can borrow the code to clean things up upon signals and program termination. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Make index file locking code reusable to others.Libravatar Junio C Hamano11-95/+98
The framework to create lockfiles that are removed at exit is first used to reliably write the index file, but it is applicable to other things, so stop calling it "cache_file". This also rewords a few remaining error message that called the index file "cache file". Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06HTTP cleanupLibravatar Junio C Hamano2-35/+38
This ifdef's out more functions that are not used while !USE_MULTI in http code. Also the dependency of http related objects on http.h header file was missing in the Makefile. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06HTTP cleanupLibravatar Nick Hengeveld2-1/+14
Fix broken build when USE_CURL_MULTI is not defined, as noted by Becky Bruce. During cleanup, free header slist that was created during init, as noted by Junio. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06git-format-patch: add --output-directory long option againLibravatar Junio C Hamano2-12/+17
Additionally notices and complains to an -o option without directory or a duplicated -o option, -o and --stdout given together. Also delays the creation of directory until all arguments are parsed, so that the command does not leave an empty directory behind when it exits after seeing an unrelated invalid option. [jc: originally from Dennis Stosberg but with minor fixes, and documentation updates from Dennis.] Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06send-email: a bit more careful domain regexp.Libravatar Junio C Hamano1-1/+1
This tightens the regexp a bit to make sure there is no double dots. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-06Merge branch 'vb/sendemail' into nextLibravatar Junio C Hamano1-4/+6
* vb/sendemail: send-email: be more lenient and just catch obvious mistakes.
2006-06-06send-email: be more lenient and just catch obvious mistakes.Libravatar Junio C Hamano1-4/+6
This cleans up the pattern matching subroutine by introducing two variables to hold regexp to approximately match local-part and domain in the e-mail address. It is meant to catch obvious mistakes with a cheap check. The patch also moves "scalar" to force Email::Valid->address() to work in !wantarray environment to extract_valid_address; earlier it was in the caller of the subroutine, which was way too error prone. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Merge branch 'master' into nextLibravatar Junio C Hamano3-5/+527
* master: rev-parse: tighten constness properly. A Perforce importer for git.
2006-06-05rev-parse: tighten constness properly.Libravatar Junio C Hamano1-5/+5
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05A Perforce importer for git.Libravatar Sean2-0/+522
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Merge branch 'js/alias' into nextLibravatar Junio C Hamano9-73/+213
* js/alias: git alias: try alias last. If you have a config containing something like this: builtin-push: don't pass --thin to HTTP transport pack-objects: improve path grouping heuristics. rev-list: fix process_tree() conversion. Fix typo in tutorial-2.txt Fix Documentation/everyday.txt: Junio's workflow Add example xinetd(8) configuration to Documentation/everyday.txt read-tree: fix eye-candy. gitview: Add some useful keybindings.
2006-06-05git alias: try alias last.Libravatar Junio C Hamano1-6/+14
This disables alias "foo" from being used for git-foo, and when we do use alias we check the built-in and then existing command names first and then alias as the fallback. This avoids the problem of common commands used in scripts getting clobbered by user specific aliases. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05If you have a config containing something like this:Libravatar Johannes Schindelin1-0/+111
[alias] l = "log --stat -M ORIG_HEAD.." you can call git l and it will do the same as git log --stat -M ORIG_HEAD.. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05builtin-push: don't pass --thin to HTTP transportLibravatar Nick Hengeveld1-9/+11
git-http-push does not currently use packs to transfer objects. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05pack-objects: improve path grouping heuristics.Libravatar Linus Torvalds1-50/+19
This trivial patch not only simplifies the name hashing, it actually improves packing for both git and the kernel. The git archive pack shrinks from 6824090->6622627 bytes (a 3% improvement), and the kernel pack shrinks from 108756213 to 108219021 (a mere 0.5% improvement, but still, it's an improvement from making the hashing much simpler!) We just create a 32-bit hash, where we "age" previous characters by two bits, so the last characters in a filename count most. So when we then compare the hashes in the sort routine, filenames that end the same way sort the same way. It takes the subdirectory into account (unless the filename is > 16 characters), but files with the same name within the same subdirectory will obviously sort closer than files in different subdirectories. And, incidentally (which is why I tried the hash change in the first place, of course) builtin-rev-list.c will sort fairly close to rev-list.c. And no, it's not a "good hash" in the sense of being secure or unique, but that's not what we're looking for. The whole "hash" thing is misnamed here. It's not so much a hash as a "sorting number". [jc: rolled in simplification for computing the sorting number computation for thin pack base objects] Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05rev-list: fix process_tree() conversion.Libravatar Linus Torvalds1-2/+2
The tree-walking conversion of the "process_tree()" function broke packing by using an unrelated variable from outer scope. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-05Fix typo in tutorial-2.txtLibravatar Linus Torvalds1-1/+1
This should be obvious enough. I didn't actually _test_ the tutorial, but if the old command worked, something is really wrong! Signed-off-by: Linus "Duh!" Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:41:33 +0000