Commits

Show all
Author Commit Message Labels Comments Date
Johannes Schindelin
Fix compile with expat, but an old curl version With an old curl version, git-http-push is not compiled. But git-http-fetch still needs to be linked with expat if NO_EXPAT is not defined. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting first and last commit gitk: Add a help menu item to display key bindings [PATCH] gitk: allow goto heads gitk: replace parent and children arrays with lists
Junio C Hamano
combine-diff: move the code to parse hunk-header into common library. Signed-off-by: Junio C Hamano <junkio@cox.net>
Pavel Roskin
Add git-clean command This command removes untracked files from the working tree. This implementation is based on cg-clean with some simplifications. The documentation is included. [jc: with trivial documentation fix, noticed by Jakub Narebski] Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge branch 'fix' * fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006
Junio C Hamano
diff_flush(): leakfix. We were leaking filepairs when output-format was set to NO_OUTPUT. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
combine-diff: refactor built-in xdiff interface. This refactors the line-by-line callback mechanism used in combine-diff so that other programs can reuse it more easily. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
parse_date(): fix parsing 03/10/2006 The comment associated with the date parsing code for three numbers separated with slashes or dashes implied we wanted to interpret using this order: yyyy-mm-dd yyyy-dd-mm mm-dd-yy dd-mm-yy However, the actual code had the last two wrong, and making it prefer dd-mm-yy format over mm-dd-yy. Signed-off-by: Junio C Hamano <junkio@cox.net>
Nick Hengeveld
http-fetch: add optional DAV-based pack list If git is not built with NO_EXPAT, this patch changes git-http-fetch to attempt using DAV to get a list of remote packs and fall back to using objects/info/packs if the DAV request fails. Signed-off-by: Nick Hengeveld <nickh@reactrix.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Keith Packard
[PATCH] Provide configurable UI font for gitk This makes the font used in the UI elements of gitk configurable in the same way the other fonts are. The default fonts used in the Xft build of tk8.5 are particularily horrific, making this change more important there. Signed-off-by: Keith Packard <keithp@neko.keithp.com> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
Mark Wooding
[PATCH] gitk: Use git wrapper to run git-ls-remote. For some reason, the Cygwin Tcl's `exec' command has trouble running scripts. Fix this by using the C `git' wrapper. Other GIT programs run by gitk are written in C already, so we don't need to incur a performance hit of going via the wrapper (which I'll bet isn't pretty under Cygwin). Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Acked-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Pa…
Rutger Nijlunsing
[PATCH] gitk: add key bindings for selecting first and last commit For a keyboard addict like me some keys are still missing from gitk. Especially a key to select a commit when no commit is selected, like just after startup. While we're at it, complete the bindings for moving the view seperately from the selected line. Currently, the up and down keys act on the selected line while pageup and pagedown act on the commits viewed. The idea is to have to normal keys …
Johannes Schindelin
On some platforms, certain headers need to be included before regex.h Happily, these are already included in cache.h, which is included anyway... so: change the order of includes. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
cvsimport: use git-update-ref when updating This simplifies code, and also fixes a subtle bug: when importing in a shared repository, where another user last imported from CVS, cvsimport used to complain that it could not open <branch> for update. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Paul Mackerras
gitk: Add a help menu item to display key bindings Suggested by Paul Schulz. I made it a separate entry under the Help menu rather than putting it in the About box, though. Signed-off-by: Paul Mackerras <paulus@samba.org>
Stephen Rothwell
[PATCH] gitk: allow goto heads This patch allows you to enter a head name in the SHA1 id: field. It also removes some unnecessary global declarations. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Junio C Hamano
combine-diff: use built-in xdiff. Now there is no GNU diff invocations, except the one from blame.c Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 1.3.0-rc2 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 who…
Tags
v1.3.0-rc2
Junio C Hamano
Merge in xdiff cleanup pieces
Nick Hengeveld
Set HTTP user agent to git/GIT_VERSION 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>
Nick Hengeveld
git-ls-remote: send no-cache header when fetching info/refs 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>
Petr Baudis
Support for pickaxe matching regular expressions git-diff-* --pickaxe-regex will change the -S pickaxe to match POSIX extended regular expressions instead of fixed strings. The regex.h library is a rather stupid interface and I like pcre too, but with any luck it will be everywhere we will want to run Git on, it being POSIX.2 and all. I'm not sure if we can expect platforms like AIX to conform to POSIX.2 or if win32 has regex.h. We might add a …
Junio C Hamano
Merge branch 'pe/cleanup' * pe/cleanup: Replace xmalloc+memset(0) with xcalloc. Use blob_, commit_, tag_, and tree_type throughout.
Junio C Hamano
Merge branch 'lt/fix-sol-pack' * 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
Peter Eriksen
Replace xmalloc+memset(0) with xcalloc. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Peter Eriksen
Use blob_, commit_, tag_, and tree_type throughout. 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>
Davide Libenzi
Clean-up trivially redundant diff. Also corrects the line numbers in unified output when using zero lines context.
Eric Wong
contrib/git-svn: handle array values correctly Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Eric Wong
contrib/git-svn: make sure our git-svn is up-to-date for test 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>
Eric Wong
contrib/git-svn: ensure repo-config returns a value before using it 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>
  1. Prev
  2. Next