summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* GIT 1.3.0-rc3v1.3.0-rc3Junio C Hamano2006-04-071-1/+1
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'kh/svn'Junio C Hamano2006-04-071-5/+10
|\ | | | | | | | | * kh/svn: git-svnimport: Don't assume that copied files haven't changed
| * git-svnimport: Don't assume that copied files haven't changedKarl Hasselström2006-04-071-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Don't assume that a file that SVN claims was copied from somewhere else is bit-for-bit identical with its parent, since SVN allows changes to copied files before they are committed. Without this fix, such copy-modify-commit operations causes the imported file to lack the "modify" part -- that is, we get subtle data corruption. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/thinpack'Junio C Hamano2006-04-071-48/+236
|\ \ | | | | | | | | | | | | * jc/thinpack: Thin pack generation: optimization.
| * | Thin pack generation: optimization.Junio C Hamano2006-04-071-48/+236
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jens Axboe noticed that recent "git push" has become very slow since we made --thin transfer the default. Thin pack generation to push a handful revisions that touch relatively small number of paths out of huge tree was stupid; it registered _everything_ from the excluded revisions. As a result, "Counting objects" phase was unnecessarily expensive. This changes the logic to register the blobs and trees from excluded revisions only for paths we are actually going to send to the other end. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/date'Junio C Hamano2006-04-071-21/+56
|\ \ | | | | | | | | | | | | * jc/date: date parsing: be friendlier to our European friends.
| * | date parsing: be friendlier to our European friends.Junio C Hamano2006-04-051-21/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This does three things, only applies to cases where the user manually tries to override the author/commit time by environment variables, with non-ISO, non-2822 format date-string: - Refuses to use the interpretation to put the date in the future; recent kernel history has a commit made with 10/03/2006 which is recorded as October 3rd. - Adds '.' as the possible year-month-date separator. We learned from our European friends on the #git channel that dd.mm.yyyy is the norm there. - When the separator is '.', we prefer dd.mm.yyyy over mm.dd.yyyy; otherwise mm/dd/yy[yy] takes precedence over dd/mm/yy[yy]. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'nh/http'Junio C Hamano2006-04-072-2/+287
|\ \ \ | | | | | | | | | | | | | | | | | | | | * nh/http: Fix compile with expat, but an old curl version http-fetch: add optional DAV-based pack list
| * | | Fix compile with expat, but an old curl versionJohannes Schindelin2006-04-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | http-fetch: add optional DAV-based pack listNick Hengeveld2006-04-042-1/+284
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'ew/rev-abbrev'Junio C Hamano2006-04-071-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ew/rev-abbrev: rev-list --abbrev-commit
| * | | | rev-list --abbrev-commitJunio C Hamano2006-04-071-1/+14
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | This should make --pretty=oneline a whole lot more readable for people using 80-column terminals. Originally from Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/blame'Junio C Hamano2006-04-077-302/+419
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface. blame: use built-in xdiff combine-diff: move the code to parse hunk-header into common library. combine-diff: refactor built-in xdiff interface. combine-diff: use built-in xdiff.
| * | | | blame -S <ancestry-file>Junio C Hamano2006-04-073-60/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the -S <ancestry-file> option to blame, which is needed by the CVS server emulation. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | Match ofs/cnt types in diff interface.Junio C Hamano2006-04-063-7/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | blame: use built-in xdiffJunio C Hamano2006-04-051-93/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the last use of external diff from core git suite. Also addresses the use of index() -- elsewhere we tend to use strchr(). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | combine-diff: move the code to parse hunk-header into common library.Junio C Hamano2006-04-053-46/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | combine-diff: refactor built-in xdiff interface.Junio C Hamano2006-04-054-46/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | combine-diff: use built-in xdiff.Junio C Hamano2006-04-041-102/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now there is no GNU diff invocations, except the one from blame.c Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-04-071-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk
| * | | | | gitk: Fix incorrect invocation of getmergedifflinePaul Mackerras2006-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | [PATCH] gitk: Fix searching for filenames in gitkPavel Roskin2006-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | | | | Merge branch 'maint'Junio C Hamano2006-04-073-9/+28
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | * maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully
| * | | | | count-delta: match get_delta_hdr_size() changes.v1.2.6Junio C Hamano2006-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | check patch_delta bounds more carefullyNicolas Pitre2006-04-073-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let's avoid going south with invalid delta data. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | Add Documentation/technical/pack-format.txtJunio C Hamano2006-04-071-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | Added Packing Heursitics IRC writeup.Jon Loeliger2006-04-071-0/+466
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | Add documentation for git-imap-send.Mike McCormack2006-04-051-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | blame.c: fix completely broken ancestry traversal.Junio C Hamano2006-04-051-0/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent revision.c updates completely broken the assignment of blames by not rewriting commit->parents field unless explicitly asked to by the caller. The caller needs to set revs.parents. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Tweaks to make asciidoc play nice.Francis Daly2006-04-051-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once the content has been generated, the formatting elves can reorder it to be pretty... Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | git-commit: document --amendMarco Roeland2006-04-051-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. [jc: amended further to follow the recommendation by Francis in commit 3070b60]. Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Merge branch 'jc/clone'Junio C Hamano2006-04-051-19/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * jc/clone: git-clone: fix handling of upsteram whose HEAD does not point at master.
| * | | | | git-clone: fix handling of upsteram whose HEAD does not point at master.Junio C Hamano2006-04-021-19/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cloning from a remote repository that has master, main, and origin branches _and_ with the HEAD pointing at main branch, we did quite confused things during clone. So this cleans things up. The behaviour is a bit different between separate remotes/ layout and the mixed branches layout. The newer layout with $GIT_DIR/refs/remotes/$origin/, things are simpler and more transparent: - remote branches are copied to refs/remotes/$origin/. - HEAD points at the branch with the same name as the remote HEAD points at, and starts at where the remote HEAD points at. - $GIT_DIR/remotes/$origin file is set up to fetch all remote branches, and merge the branch HEAD pointed at at the time of the cloning. Everything-in-refs/heads layout was the more confused one, but cleaned up like this: - remote branches are copied to refs/heads, but the branch "$origin" is not copied, instead a copy of the branch the remote HEAD points at is created there. - HEAD points at the branch with the same name as the remote HEAD points at, and starts at where the remote HEAD points at. - $GIT_DIR/remotes/$origin file is set up to fetch all remote branches except "$origin", and merge the branch HEAD pointed at at the time of the cloning. With this, the remote has master, main and origin, and its HEAD points at main, you could: git clone $URL --origin upstream to use refs/heads/upstream as the tracking branch for remote "main", and your primary working branch will also be "main". "master" and "origin" are used to track the corresponding remote branches and with this setup they do not have any special meaning. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | Merge branch 'pb/regex'Junio C Hamano2006-04-054-16/+57
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions
| * | | | | | On some platforms, certain headers need to be included before regex.hJohannes Schindelin2006-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | Support for pickaxe matching regular expressionsPetr Baudis2006-04-044-16/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 flag to Makefile if there is a portability trouble potential. Signed-off-by: Petr Baudis <pasky@suse.cz>
* | | | | | | Avoid a crash if realloc returns a different pointer.Mike McCormack2006-04-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | | Avoid a divide by zero if there's no messages to send.Mike McCormack2006-04-051-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-04-051-106/+225
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | | | [PATCH] Provide configurable UI font for gitkKeith Packard2006-04-051-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | [PATCH] gitk: Use git wrapper to run git-ls-remote.Mark Wooding2006-04-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Paul Mackerras <paulus@samba.org>
| * | | | | | [PATCH] gitk: add key bindings for selecting first and last commitRutger Nijlunsing2006-04-051-6/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 change the selected line: - Home selects first commit - End selects last commit - Up selects previous commit - Down selects next commit - PageUp moves selected line one page up - PageDown moves selected line one page down ...and together with the Control key, it moves the commits view: - Control-Home views first page of commits - Control-End views last page of commits - Control-Up moves commit view one line up - Control-Down moves commit view one line down - Control-PageUp moves commit view one page up - Control-PageDown moves commit view one page down Signed-off-By: Rutger Nijlunsing <gitk@tux.tmfweb.nl> and with some cleanups and simplifications... Signed-off-by: Paul Mackerras <paulus@samba.org>
| * | | | | | gitk: Add a help menu item to display key bindingsPaul Mackerras2006-04-051-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | [PATCH] gitk: allow goto headsStephen Rothwell2006-04-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | | gitk: replace parent and children arrays with listsPaul Mackerras2006-04-021-93/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will make it easier to switch between views efficiently, and turns out to be slightly faster as well. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | | | | | Add git-clean commandPavel Roskin2006-04-054-1/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | Merge branch 'fix'Junio C Hamano2006-04-052-21/+27
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | |_|_|_|_|/ |/| | | | | | | | | | | * fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006
| * | | | | diff_flush(): leakfix.Junio C Hamano2006-04-051-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were leaking filepairs when output-format was set to NO_OUTPUT. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | parse_date(): fix parsing 03/10/2006Junio C Hamano2006-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | cvsimport: use git-update-ref when updatingJohannes Schindelin2006-04-041-5/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>