| a0a0195 | Junio C Hamano | 08 April 2006, 01:02:40 UTC | GIT 1.3.0-rc3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 April 2006, 01:02:40 UTC |
| a906ce6 | Junio C Hamano | 08 April 2006, 01:01:55 UTC | Merge branch 'kh/svn' * kh/svn: git-svnimport: Don't assume that copied files haven't changed | 08 April 2006, 01:01:55 UTC |
| 90238fb | Junio C Hamano | 08 April 2006, 01:00:16 UTC | Merge branch 'jc/thinpack' * jc/thinpack: Thin pack generation: optimization. | 08 April 2006, 01:00:16 UTC |
| 9f2700c | Junio C Hamano | 08 April 2006, 01:00:06 UTC | Merge branch 'jc/date' * jc/date: date parsing: be friendlier to our European friends. | 08 April 2006, 01:00:06 UTC |
| 028e049 | Junio C Hamano | 08 April 2006, 00:59:36 UTC | Merge branch 'nh/http' * nh/http: Fix compile with expat, but an old curl version http-fetch: add optional DAV-based pack list | 08 April 2006, 00:59:36 UTC |
| f1fffec | Junio C Hamano | 08 April 2006, 00:59:10 UTC | Merge branch 'ew/rev-abbrev' * ew/rev-abbrev: rev-list --abbrev-commit | 08 April 2006, 00:59:10 UTC |
| 45fa760 | Junio C Hamano | 08 April 2006, 00:57:46 UTC | Merge branch 'jc/blame' * 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. | 08 April 2006, 00:57:46 UTC |
| d69dc37 | Junio C Hamano | 07 April 2006, 23:52:59 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk | 07 April 2006, 23:52:59 UTC |
| ce18135 | Junio C Hamano | 07 April 2006, 23:51:55 UTC | Merge branch 'maint' * maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully | 07 April 2006, 23:51:55 UTC |
| 98cf815 | Junio C Hamano | 07 April 2006, 23:48:09 UTC | count-delta: match get_delta_hdr_size() changes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 23:48:09 UTC |
| 8960844 | Nicolas Pitre | 07 April 2006, 19:26:10 UTC | check patch_delta bounds more carefully 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> | 07 April 2006, 23:31:20 UTC |
| e67c662 | Karl Hasselström | 07 April 2006, 06:06:09 UTC | git-svnimport: Don't assume that copied files haven't changed 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> | 07 April 2006, 09:11:33 UTC |
| 5c51c98 | Junio C Hamano | 07 April 2006, 04:32:36 UTC | rev-list --abbrev-commit 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> | 07 April 2006, 09:09:18 UTC |
| 5379a5c | Junio C Hamano | 06 April 2006, 06:24:57 UTC | Thin pack generation: optimization. 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> | 07 April 2006, 09:08:38 UTC |
| 9760662 | Junio C Hamano | 07 April 2006, 09:07:40 UTC | Add Documentation/technical/pack-format.txt ... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:07:40 UTC |
| b116b29 | Jon Loeliger | 03 March 2006, 01:19:29 UTC | Added Packing Heursitics IRC writeup. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:06:18 UTC |
| 5040f17 | Junio C Hamano | 07 April 2006, 06:58:51 UTC | blame -S <ancestry-file> 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> | 07 April 2006, 08:59:51 UTC |
| a0fd314 | Junio C Hamano | 07 April 2006, 05:29:55 UTC | Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 05:29:55 UTC |
| 454a35b | Mike McCormack | 06 April 2006, 03:32:19 UTC | Add documentation for git-imap-send. Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2006, 03:48:40 UTC |
| ba3c937 | Junio C Hamano | 06 April 2006, 01:21:17 UTC | blame.c: fix completely broken ancestry traversal. 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> | 06 April 2006, 01:21:17 UTC |
| c5a4c4d | Paul Mackerras | 06 April 2006, 00:20:03 UTC | gitk: Fix incorrect invocation of getmergediffline Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 April 2006, 00:20:03 UTC |
| 3754354 | Pavel Roskin | 05 April 2006, 23:02:50 UTC | [PATCH] gitk: Fix searching for filenames in gitk findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 April 2006, 00:19:23 UTC |
| 38035cf | Junio C Hamano | 05 April 2006, 22:31:12 UTC | date parsing: be friendlier to our European friends. 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> | 05 April 2006, 22:47:17 UTC |
| 6cbd5d7 | Francis Daly | 05 April 2006, 22:25:17 UTC | Tweaks to make asciidoc play nice. 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> | 05 April 2006, 22:46:54 UTC |
| f2f880f | Junio C Hamano | 05 April 2006, 19:23:29 UTC | blame: use built-in xdiff 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> | 05 April 2006, 21:25:25 UTC |
| ae5d847 | Marco Roeland | 05 April 2006, 20:28:28 UTC | git-commit: document --amend 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> | 05 April 2006, 21:07:21 UTC |
| 3ffe0c2 | Junio C Hamano | 05 April 2006, 21:06:50 UTC | Merge branch 'jc/clone' * jc/clone: git-clone: fix handling of upsteram whose HEAD does not point at master. | 05 April 2006, 21:06:50 UTC |
| 9b6891f | Junio C Hamano | 05 April 2006, 21:06:26 UTC | Merge branch 'pb/regex' * pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions | 05 April 2006, 21:06:26 UTC |
| 34c5a9e | Mike McCormack | 05 April 2006, 14:22:19 UTC | Avoid a crash if realloc returns a different pointer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 20:00:07 UTC |
| 1cd88cc | Mike McCormack | 05 April 2006, 14:22:52 UTC | Avoid a divide by zero if there's no messages to send. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 20:00:03 UTC |
| 459a21b | Johannes Schindelin | 05 April 2006, 14:22:40 UTC | 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> | 05 April 2006, 19:49:56 UTC |
| 521a3f6 | Junio C Hamano | 05 April 2006, 19:45:17 UTC | 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 | 05 April 2006, 19:45:17 UTC |
| c1e335a | Junio C Hamano | 05 April 2006, 19:22:35 UTC | combine-diff: move the code to parse hunk-header into common library. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 19:22:35 UTC |
| c3b831b | Pavel Roskin | 05 April 2006, 06:00:48 UTC | 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> | 05 April 2006, 09:51:27 UTC |
| 12d81ce | Junio C Hamano | 05 April 2006, 09:50:54 UTC | Merge branch 'fix' * fix: diff_flush(): leakfix. parse_date(): fix parsing 03/10/2006 | 05 April 2006, 09:50:54 UTC |
| 7d6c447 | Junio C Hamano | 05 April 2006, 09:06:49 UTC | diff_flush(): leakfix. We were leaking filepairs when output-format was set to NO_OUTPUT. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 09:48:41 UTC |
| d9ea73e | Junio C Hamano | 05 April 2006, 09:03:58 UTC | 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> | 05 April 2006, 09:09:58 UTC |
| fa0cdab | Junio C Hamano | 05 April 2006, 05:57:15 UTC | 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> | 05 April 2006, 06:00:18 UTC |
| 8d9fbe5 | Nick Hengeveld | 04 April 2006, 12:33:18 UTC | 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> | 05 April 2006, 01:06:35 UTC |
| 4840be6 | Keith Packard | 04 April 2006, 07:19:45 UTC | [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> | 05 April 2006, 00:29:47 UTC |
| ce08872 | Mark Wooding | 04 April 2006, 06:24:55 UTC | [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: Paul Mackerras <paulus@samba.org> | 05 April 2006, 00:28:34 UTC |
| 6e5f720 | Rutger Nijlunsing | 05 April 2006, 00:24:03 UTC | [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 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> | 05 April 2006, 00:24:03 UTC |
| 46b8dec | Johannes Schindelin | 04 April 2006, 23:01:03 UTC | 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> | 05 April 2006, 00:14:06 UTC |
| 42277bc | Johannes Schindelin | 30 March 2006, 12:06:15 UTC | 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> | 05 April 2006, 00:13:25 UTC |
| 4e95e1f | Paul Mackerras | 04 April 2006, 23:39:51 UTC | 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> | 04 April 2006, 23:39:51 UTC |
| e100712 | Stephen Rothwell | 30 March 2006, 05:13:12 UTC | [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> | 04 April 2006, 23:14:02 UTC |
| f23fc77 | Junio C Hamano | 04 April 2006, 01:53:15 UTC | 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> | 04 April 2006, 21:53:43 UTC |
| fc4c4cd | Junio C Hamano | 04 April 2006, 21:52:53 UTC | 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 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> | 04 April 2006, 21:52:53 UTC |
| 3d9c54d | Junio C Hamano | 04 April 2006, 21:43:57 UTC | Merge in xdiff cleanup pieces | 04 April 2006, 21:43:57 UTC |
| 20fc9bc | Nick Hengeveld | 04 April 2006, 17:11:29 UTC | 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> | 04 April 2006, 21:42:47 UTC |
| 7fa8ddd | Nick Hengeveld | 04 April 2006, 18:01:30 UTC | 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> | 04 April 2006, 21:36:22 UTC |
| d01d8c6 | Petr Baudis | 29 March 2006, 00:16:33 UTC | 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 flag to Makefile if there is a portability trouble potential. Signed-off-by: Petr Baudis <pasky@suse.cz> | 04 April 2006, 20:44:15 UTC |
| 810e152 | Junio C Hamano | 04 April 2006, 20:43:00 UTC | Merge branch 'pe/cleanup' * pe/cleanup: Replace xmalloc+memset(0) with xcalloc. Use blob_, commit_, tag_, and tree_type throughout. | 04 April 2006, 20:43:00 UTC |
| 4c61b7d | Junio C Hamano | 04 April 2006, 20:42:02 UTC | 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 | 04 April 2006, 20:42:02 UTC |
| 90321c1 | Peter Eriksen | 03 April 2006, 18:30:46 UTC | Replace xmalloc+memset(0) with xcalloc. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2006, 07:11:19 UTC |
| 8e44025 | Peter Eriksen | 02 April 2006, 12:44:09 UTC | 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> | 04 April 2006, 07:11:19 UTC |
| ca557af | Davide Libenzi | 04 April 2006, 01:47:55 UTC | Clean-up trivially redundant diff. Also corrects the line numbers in unified output when using zero lines context. | 04 April 2006, 07:11:09 UTC |
| fc9957b | Eric Wong | 04 April 2006, 00:41:44 UTC | contrib/git-svn: handle array values correctly Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2006, 07:09:47 UTC |
| 5f2f424 | Eric Wong | 03 April 2006, 22:18:49 UTC | 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> | 04 April 2006, 07:09:45 UTC |
| 5941a9e | Eric Wong | 03 April 2006, 22:18:48 UTC | 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> | 04 April 2006, 07:09:42 UTC |
| 72fdfb5 | Jason Riedy | 02 April 2006, 22:29:34 UTC | Use sigaction and SA_RESTART in read-tree.c; add option in Makefile. 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> | 04 April 2006, 06:42:25 UTC |
| 687dd75 | Junio C Hamano | 04 April 2006, 06:41:09 UTC | safe_fgets() - even more anal fgets() This is from Linus -- the previous round forgot to clear error after EINTR case. Signed-off-by: Junio C Hamano <junkio@cox.net> | 04 April 2006, 06:42:25 UTC |
| c72112e | Junio C Hamano | 02 April 2006, 23:25:01 UTC | git-clone: fix handling of upsteram whose HEAD does not point at master. 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> | 03 April 2006, 05:22:27 UTC |
| 40e907b | Jim Radford | 03 April 2006, 03:50:17 UTC | fix repacking with lots of tags 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> | 03 April 2006, 04:25:57 UTC |
| 23091e9 | J. Bruce Fields | 02 April 2006, 21:54:34 UTC | Documentation: revise top of git man page 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> | 03 April 2006, 04:17:32 UTC |
| da93d12 | Linus Torvalds | 02 April 2006, 20:31:54 UTC | pack-objects: be incredibly anal about stdio semantics 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> | 02 April 2006, 20:46:27 UTC |
| fb7a653 | Linus Torvalds | 02 April 2006, 20:28:27 UTC | Fix Solaris stdio signal handling stupidities 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> | 02 April 2006, 20:41:56 UTC |
| ec26b4d | Rene Scharfe | 02 April 2006, 11:13:10 UTC | Fix sparse warnings about non-ANSI function prototypes Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 April 2006, 19:58:47 UTC |
| 5142db6 | Rene Scharfe | 02 April 2006, 11:13:01 UTC | Fix sparse warnings about usage of 0 instead of NULL Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 April 2006, 19:58:46 UTC |
| 139faba | Rene Scharfe | 02 April 2006, 11:12:47 UTC | Remove useless pointer update 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> | 02 April 2006, 19:58:45 UTC |
| 79b2c75 | Paul Mackerras | 02 April 2006, 10:47:40 UTC | gitk: replace parent and children arrays with lists 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> | 02 April 2006, 10:47:40 UTC |
| 20b1d70 | Eric Wong | 02 April 2006, 02:25:03 UTC | contrib/git-svn: documentation updates 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> | 02 April 2006, 05:57:55 UTC |
| 5390905 | Eric Wong | 02 April 2006, 02:25:02 UTC | contrib/git-svn: accept configuration via repo-config 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> | 02 April 2006, 05:57:52 UTC |
| bbbc8c3 | Junio C Hamano | 02 April 2006, 03:13:22 UTC | revision: --max-age alone does not need limit_list() anymore. This makes git log --since=7.days to be streamable. Signed-off-by: Junio C Hamano <junkio@cox.net> | 02 April 2006, 03:13:22 UTC |
| 5306968 | Junio C Hamano | 02 April 2006, 02:38:25 UTC | revision: simplify argument parsing. 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> | 02 April 2006, 02:56:16 UTC |
| 22c31bf | Junio C Hamano | 02 April 2006, 02:52:58 UTC | revision: --topo-order and --unpacked 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> | 02 April 2006, 02:55:56 UTC |
| be7db6e | Linus Torvalds | 02 April 2006, 00:35:06 UTC | revision: Fix --topo-order and --max-age with reachability limiting. 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> | 02 April 2006, 02:16:53 UTC |
| 2a0925b | Linus Torvalds | 31 March 2006, 01:05:25 UTC | Make path-limiting be incremental when possible. 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> | 01 April 2006, 00:24:48 UTC |
| 7b0c996 | Linus Torvalds | 31 March 2006, 00:52:42 UTC | Move "--parent" parsing into generic revision.c library code 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> | 01 April 2006, 00:24:48 UTC |
| 8eef8e0 | Junio C Hamano | 01 April 2006, 00:23:46 UTC | Makefile: many programs now depend on xdiff/lib.a having been built. 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> | 01 April 2006, 00:23:46 UTC |
| 4c0fea0 | Junio C Hamano | 31 March 2006, 07:59:19 UTC | rev-list --boundary: fix re-injecting boundary commits. 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> | 31 March 2006, 07:59:19 UTC |
| b4a081b | Junio C Hamano | 31 March 2006, 00:27:03 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * 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 | 31 March 2006, 00:27:03 UTC |
| 879e8b1 | Paul Mackerras | 30 March 2006, 23:45:14 UTC | gitk: Better workaround for arrows on diagonal line segments 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> | 30 March 2006, 23:45:14 UTC |
| 13ccd6d | Eric Wong | 30 March 2006, 06:37:18 UTC | contrib/git-svn: force GIT_DIR to an absolute path 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> | 30 March 2006, 23:40:38 UTC |
| ef5b4ea | Yasushi SHOJI | 30 March 2006, 17:01:23 UTC | git-clone: exit early if repo isn't specified 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> | 30 March 2006, 23:31:21 UTC |
| 98a4fef | Yasushi SHOJI | 30 March 2006, 17:00:43 UTC | Make git-clone to take long double-dashed origin option (--origin) 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> | 30 March 2006, 23:31:03 UTC |
| be0cd09 | Paul Mackerras | 30 March 2006, 22:55:11 UTC | gitk: Allow top panes to scroll horizontally with mouse button 2 Signed-off-by: Paul Mackerras <paulus@samba.org> | 30 March 2006, 22:55:11 UTC |
| f340844 | Paul Mackerras | 30 March 2006, 22:54:24 UTC | gitk: Prevent parent link from overwriting commit headline 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> | 30 March 2006, 22:54:24 UTC |
| 7b5ff7e | Paul Mackerras | 30 March 2006, 09:50:40 UTC | gitk: Show diffs for boundary commits 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> | 30 March 2006, 09:50:40 UTC |
| 1b0c717 | Junio C Hamano | 30 March 2006, 06:55:43 UTC | tree/diff header cleanup. 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> | 30 March 2006, 07:54:13 UTC |
| e464f4c | Junio C Hamano | 30 March 2006, 07:00:42 UTC | assume unchanged git: diff-index fix. 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> | 30 March 2006, 07:53:05 UTC |
| 16c1ff9 | Paul Mackerras | 30 March 2006, 07:43:51 UTC | gitk: Use the new --boundary flag to git-rev-list 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> | 30 March 2006, 07:43:51 UTC |
| 0c8b106 | Junio C Hamano | 30 March 2006, 07:30:52 UTC | revision.c "..B" syntax: constness fix 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> | 30 March 2006, 07:30:52 UTC |
| ce4a706 | Junio C Hamano | 30 March 2006, 03:41:37 UTC | revision arguments: ..B means HEAD..B, just like A.. means A..HEAD 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> | 30 March 2006, 03:41:37 UTC |
| 384e99a | Junio C Hamano | 28 March 2006, 07:58:34 UTC | rev-list --boundary 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> | 29 March 2006, 01:29:21 UTC |
| 9181ca2 | Junio C Hamano | 29 March 2006, 01:28:04 UTC | rev-list: memory usage reduction. 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> | 29 March 2006, 01:29:09 UTC |
| 5cdeae7 | Junio C Hamano | 28 March 2006, 08:04:50 UTC | rev-list --no-merges: argument parsing fix. Signed-off-by: Junio C Hamano <junkio@cox.net> | 28 March 2006, 08:04:50 UTC |
| acb7257 | Mark Wooding | 28 March 2006, 02:23:31 UTC | xdiff: Show function names in hunk headers. 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> | 28 March 2006, 02:43:51 UTC |
| 9c48666 | Jason Riedy | 28 March 2006, 01:15:24 UTC | Add ALL_LDFLAGS to the git target. 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> | 28 March 2006, 01:55:20 UTC |
| dff86e2 | Junio C Hamano | 28 March 2006, 00:08:29 UTC | GIT 1.3.0 rc1 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> | 28 March 2006, 00:08:29 UTC |
