aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* GIT 1.3.0-rc2v1.3.0-rc2Junio C Hamano2006-04-04
| | | | | | | | | | | | | | | | | | | Bunch of cleanups with a few notable enhancements since 1.3.0-rc1: - revision traversal infrastructure is updated so that existence of paths limiters and/or --max-age does not cause it to call limit_list(). This helps the latency working with the command quite a bit. - comes with updated gitk. One notable fix is to make sure that the IO is restarted upon signal even on platforms whose default signal semantics is not to do so. This is the fix for the notorious "clone is broken since 1.2.2 on Solaris" problem. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge in xdiff cleanup piecesJunio C Hamano2006-04-04
|\
| * Clean-up trivially redundant diff.Davide Libenzi2006-04-04
| | | | | | | | | | Also corrects the line numbers in unified output when using zero lines context.
* | Set HTTP user agent to git/GIT_VERSIONNick Hengeveld2006-04-04
| | | | | | | | | | | | | | | | Useful for diagnostics/troubleshooting to know which client versions are hitting your server. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-ls-remote: send no-cache header when fetching info/refsNick Hengeveld2006-04-04
| | | | | | | | | | | | | | | | | | | | Proxies should not cache this file as it can cause a client to end up with a stale version, as reported here: http://marc.theaimsgroup.com/?l=git&m=114407944125389 Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'pe/cleanup'Junio C Hamano2006-04-04
|\ \ | | | | | | | | | | | | | | | * pe/cleanup: Replace xmalloc+memset(0) with xcalloc. Use blob_, commit_, tag_, and tree_type throughout.
| * | Replace xmalloc+memset(0) with xcalloc.Peter Eriksen2006-04-04
| | | | | | | | | | | | | | | Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen2006-04-04
| |/ | | | | | | | | | | | | | | | | This replaces occurences of "blob", "commit", "tag", and "tree", where they're really used as type specifiers, which we already have defined global constants for. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'lt/fix-sol-pack'Junio C Hamano2006-04-04
|\ \ | |/ |/| | | | | | | | | | | * lt/fix-sol-pack: Use sigaction and SA_RESTART in read-tree.c; add option in Makefile. safe_fgets() - even more anal fgets() pack-objects: be incredibly anal about stdio semantics Fix Solaris stdio signal handling stupidities
| * Use sigaction and SA_RESTART in read-tree.c; add option in Makefile.v1.2.5Jason Riedy2006-04-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Might as well ape the sigaction change in read-tree.c to avoid the same potential problems. The fprintf status output will be overwritten in a second, so don't bother guarding it. Do move the fputc after disabling SIGALRM to ensure we go to the next line, though. Also add a NO_SA_RESTART option in the Makefile in case someone doesn't have SA_RESTART but does restart (maybe older HP/UX?). We want the builder to chose this specifically in case the system both lacks SA_RESTART and does not restart stdio calls; a compat #define in git-compat-utils.h would silently allow broken systems. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * safe_fgets() - even more anal fgets()Junio C Hamano2006-04-03
| | | | | | | | | | | | | | This is from Linus -- the previous round forgot to clear error after EINTR case. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * pack-objects: be incredibly anal about stdio semanticsLinus Torvalds2006-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | This is the "letter of the law" version of using fgets() properly in the face of incredibly broken stdio implementations. We can work around the Solaris breakage with SA_RESTART, but in case anybody else is ever that stupid, here's the "safe" (read: "insanely anal") way to use fgets. It probably goes without saying that I'm not terribly impressed by Solaris libc. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Fix Solaris stdio signal handling stupiditiesLinus Torvalds2006-04-02
| | | | | | | | | | | | | | | | | | | | | | This uses sigaction() to install the SIGALRM handler with SA_RESTART, so that Solaris stdio doesn't break completely when a signal interrupts a read. Thanks to Jason Riedy for confirming the silly Solaris signal behaviour. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: handle array values correctlyEric Wong2006-04-04
| | | | | | | | | | Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: make sure our git-svn is up-to-date for testEric Wong2006-04-04
| | | | | | | | | | | | | | | | Bugs like the last one could've been avoided if it weren't for this... Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: ensure repo-config returns a value before using itEric Wong2006-04-04
| | | | | | | | | | | | | | fetching from repos without an authors-file defined was broken. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | fix repacking with lots of tagsJim Radford2006-04-02
| | | | | | | | | | | | | | | | Use git-rev-list's --all instead of git-rev-parse's to keep from hitting the shell's argument list length limits when repacking with lots of tags. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation: revise top of git man pageJ. Bruce Fields2006-04-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm afraid I'll be accused of trying to suck all the jokes and the personality out of the git documentation. I'm not! Really! That said, "man git" is one of the first things a new user is likely try, and it seems a little cruel to start off with a somewhat obscure joke about the architecture of git. So instead I'm trying for a relatively straightforward description of what git does, and what features distinguish it from other systems, together with immediate links to introductory documentation. I also did some minor reorganization in an attempt to clarify the classification of commands. And revised a bit for conciseness (as is obvious from the diffstat--hopefully I didn't cut anything important). Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix sparse warnings about non-ANSI function prototypesRene Scharfe2006-04-02
| | | | | | | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix sparse warnings about usage of 0 instead of NULLRene Scharfe2006-04-02
| | | | | | | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Remove useless pointer updateRene Scharfe2006-04-02
| | | | | | | | | | | | | | | | buf is not used afterwards. The compiler optimized the dead store out anyway, but let's clean the source, too. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: documentation updatesEric Wong2006-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | contrib/git-svn/git-svn.txt: added git-repo-config key names for options fixed quoting of "git-svn-HEAD" in the manpage use preformatted text for examples contrib/git-svn/Makefile: add target to generate HTML: http://git-svn.yhbt.net/git-svn.html Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | contrib/git-svn: accept configuration via repo-configEric Wong2006-04-01
| | | | | | | | | | | | | | | | repo-config keys are any of the long option names minus the '-' characters Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision: --max-age alone does not need limit_list() anymore.Junio C Hamano2006-04-01
| | | | | | | | | | | | This makes git log --since=7.days to be streamable. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision: simplify argument parsing.Junio C Hamano2006-04-01
| | | | | | | | | | | | | | This just moves code around to consolidate the part that sets revs->limited to one place based on various flags. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision: --topo-order and --unpackedJunio C Hamano2006-04-01
| | | | | | | | | | | | | | Now, using --unpacked without limit_list() does not make much sense, but this is parallel to the earlier --max-age fix. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | revision: Fix --topo-order and --max-age with reachability limiting.Linus Torvalds2006-04-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What ends up not working very well at all is the combination of "--topo-order" and the output filter in get_revision. It will return NULL when we see the first commit out of date-order, even if we have other commits coming. So we really should do the "past the date order" thing in get_revision() only if we have _not_ done it already in limit_list(). Something like this. The easiest way to test this is with just gitk --since=3.days.ago on the kernel tree. Without this patch, it tends to be pretty obviously broken. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Make path-limiting be incremental when possible.Linus Torvalds2006-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes git-rev-list able to do path-limiting without having to parse all of history before it starts showing the results. This makes things like "git log -- pathname" much more pleasant to use. This is actually a pretty small patch, and the biggest part of it is purely cleanups (turning the "goto next" statements into "continue"), but it's conceptually a lot bigger than it looks. What it does is that if you do a path-limited revision list, and you do _not_ ask for pseudo-parenthood information, it won't do all the path-limiting up-front, but instead do it incrementally in "get_revision()". This is an absolutely huge deal for anything like "git log -- <pathname>", but also for some things that we don't do yet - like the "find where things changed" logic I've described elsewhere, where we want to find the previous revision that changed a file. The reason I put "RFC" in the subject line is that while I've validated it various ways, like doing git-rev-list HEAD -- drivers/char/ | md5sum before-and-after on the kernel archive, it's "git-rev-list" after all. In other words, it's that really really subtle and complex central piece of software. So while I think this is important and should go in asap, I also think it should get lots of testing and eyeballs looking at the code. Btw, don't even bother testing this with the git archive. git itself is so small that parsing the whole revision history for it takes about a second even with path limiting. The thing that _really_ shows this off is doing git log drivers/ on the kernel archive, or even better, on the _historic_ kernel archive. With this change, the response is instantaneous (although seeking to the end of the result will obviously take as long as it ever did). Before this change, the command would think about the result for tens of seconds - or even minutes, in the case of the bigger old kernel archive - before starting to output the results. NOTE NOTE NOTE! Using path limiting with things like "gitk", which uses the "--parents" flag to actually generate a pseudo-history of the resulting commits won't actually see the improvement in interactivity, since that forces git-rev-list to do the whole-history thing after all. MAYBE we can fix that too at some point, but I won't promise anything. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Move "--parent" parsing into generic revision.c library codeLinus Torvalds2006-03-31
| | | | | | | | | | | | | | | | | | Not only do we do it in both rev-list.c and git.c, the revision walking code will soon want to know whether we should rewrite parenthood information or not. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Makefile: many programs now depend on xdiff/lib.a having been built.Junio C Hamano2006-03-31
| | | | | | | | | | | | | | The dependency was not properly updated when we added this library, breaking parallel build with $(MAKE) -j. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | rev-list --boundary: fix re-injecting boundary commits.Junio C Hamano2006-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marco reported that $ git rev-list --boundary --topo-order --parents 5aa44d5..ab57c8d misses these two boundary commits. c649657501bada28794a30102d9c13cc28ca0e5e eb38cc689e84a8fd01c1856e889fe8d3b4f1bfb4 Indeed, we can see that gitk shows these two commits at the bottom, because the --boundary code failed to output them. The code did not check to avoid pushing the same uninteresting commit twice to the result list. I am not sure why this fixes the reported problem, but this seems to fix it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-03-30
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Better workaround for arrows on diagonal line segments gitk: Allow top panes to scroll horizontally with mouse button 2 gitk: Prevent parent link from overwriting commit headline gitk: Show diffs for boundary commits gitk: Use the new --boundary flag to git-rev-list
| * | gitk: Better workaround for arrows on diagonal line segmentsPaul Mackerras2006-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of adding extra padding to create a vertical line segment at the lower end of a line that has an arrow, this now just draws a very short vertical line segment at the lower end. This alternative workaround for the Tk8.4 behaviour (not drawing arrows on diagonal line segments) doesn't have the problem of making the graph very wide when people do a lot of merges in a row (hi Junio :). Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | gitk: Allow top panes to scroll horizontally with mouse button 2Paul Mackerras2006-03-31
| | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | gitk: Prevent parent link from overwriting commit headlinePaul Mackerras2006-03-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I made drawlineseg responsible for drawing the link to the first child rather than drawparentlinks, that meant that the right-most X value computed by drawparentlinks didn't include those first-child links, and thus the first-child link could go over the top of the commit headline. This fixes it. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | gitk: Show diffs for boundary commitsPaul Mackerras2006-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | With this we run git-diff-tree on a commit even if we think it has no parents, either because it really has no parents or because it is a boundary commit. This means that gitk shows the diff for a boundary commit when it is selected. Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | gitk: Use the new --boundary flag to git-rev-listPaul Mackerras2006-03-30
| | | | | | | | | | | | | | | | | | | | | | | | With this, we can show the boundary (open-circle) commits immediately after their last child, which looks much better than putting all the boundary commits at the bottom of the graph. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | contrib/git-svn: force GIT_DIR to an absolute pathEric Wong2006-03-30
| | | | | | | | | | | | | | | | | | | | | We chdir internally, so we need a consistent GIT_DIR variable. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | git-clone: exit early if repo isn't specifiedYasushi SHOJI2006-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-clone without a repo isn't useful at all. print message and get out asap. This patch also move the variable 'local' to where other variables are initialized. Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Make git-clone to take long double-dashed origin option (--origin)Yasushi SHOJI2006-03-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-clone currently take option '-o' to specify origin. this patch makes git-clone to take double-dashed option '--origin' and other abbreviations in addtion to the current single-dashed option. [jc: with minor fixups] Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | tree/diff header cleanup.Junio C Hamano2006-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce tree-walk.[ch] and move "struct tree_desc" and associated functions from various places. Rename DIFF_FILE_CANON_MODE(mode) macro to canon_mode(mode) and move it to cache.h. This macro returns the canonicalized st_mode value in the host byte order for files, symlinks and directories -- to be compared with a tree_desc entry. create_ce_mode(mode) in cache.h is similar but is intended to be used for index entries (so it does not work for directories) and returns the value in the network byte order. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | assume unchanged git: diff-index fix.Junio C Hamano2006-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the executable bit is untrustworthy and when we are comparing the tree with the working tree, we tried to reuse the mode bits recorded in the index incorrectly (the computation was bogus on little endian architectures). Just use mode from index when it is a regular file. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | revision.c "..B" syntax: constness fixJunio C Hamano2006-03-29
| | | | | | | | | | | | | | | | | | | | | The earlier change to make "..B" to mean "HEAD..B" (aka ^HEAD B) has constness gotcha GCC complains. Fix it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | revision arguments: ..B means HEAD..B, just like A.. means A..HEADJunio C Hamano2006-03-29
| | | | | | | | | | | | | | | | | | | | | | | | For consistency reasons, we should probably allow that to be written as just "..branch", the same way we can write "branch.." to mean "everything in HEAD but not in "branch". Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | rev-list --boundaryJunio C Hamano2006-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new --boundary flag, the output from rev-list includes the UNINTERESING commits at the boundary, which are usually not shown. Their object names are prefixed with '-'. For example, with this graph: C side / A---B---D master You would get something like this: $ git rev-list --boundary --header --parents side..master D B tree D^{tree} parent B ... log message for commit D here ... \0-B A tree B^{tree} parent A ... log message for commit B here ... \0 Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | rev-list: memory usage reduction.Junio C Hamano2006-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need to track object refs, neither we need to save commit unless we are doing verbose header. A lot of traversal happens inside prepare_revision_walk() these days so setting things up before calling that function is necessary. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Linus Torvalds <torvalds@osdl.org>
* | | rev-list --no-merges: argument parsing fix.Junio C Hamano2006-03-28
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | xdiff: Show function names in hunk headers.Mark Wooding2006-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The speed of the built-in diff generator is nice; but the function names shown by `diff -p' are /really/ nice. And I hate having to choose. So, we hack xdiff to find the function names and print them. xdiff has grown a flag to say whether to dig up the function names. The builtin_diff function passes this flag unconditionally. I suppose it could parse GIT_DIFF_OPTS, but it doesn't at the moment. I've also reintroduced the `function name' into the test suite, from which it was removed in commit 3ce8f089. The function names are parsed by a particularly stupid algorithm at the moment: it just tries to find a line in the `old' file, from before the start of the hunk, whose first character looks plausible. Still, it's most definitely a start. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Add ALL_LDFLAGS to the git target.Jason Riedy2006-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, I need ALL_LDFLAGS in the git target only on AIX. Once it builds, only one test "fails" on AIX 5.1 with 1.3.0.rc1, t5500-fetch-pack.sh, but it looks like it's some odd tool problem in the tester + my setup and not a real bug. Signed-off-by: Jason Riedy <ejr@cs.berkeley.edu> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | GIT 1.3.0 rc1v1.3.0-rc1Junio C Hamano2006-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of the things that were not in the "master" branch were either cooked long enough in "next" without causing problems (e.g. insanely fast rename detector or true built-in diff) or isolated in a specific subsystem (e.g. tar-tree and svnimport). So I am clearing the deck to prepare for a 1.3.0. Remaining wrinkles, if any, will be ironed in the "master" branch. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-21 18:47:46 +0000