75e92aeeb7af6578e03cf367603eaf5fb5b2930c R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/d680863ceae37a96b0c4ae7872669d530aea119b d680863ceae37a96b0c4ae7872669d530aea119b

2009-01-08T10:13:13-08:00

Should probably bump this 5fd178abe1748e101c98174dd12f500d812c2b17 R. Tyler Ballance tyler@slide.com ca84fcf081d6a7db35453378270e2a7153397ec7 Shawn O. Pearce spearce@spearce.org http://github.com/rtyler/slide-git/commit/75e92aeeb7af6578e03cf367603eaf5fb5b2930c 75e92aeeb7af6578e03cf367603eaf5fb5b2930c

2009-01-08T10:07:39-08:00

2009-01-07T19:16:55-08:00

Wrap inflateInit to retry allocation after releasing pack memory If we are running low on virtual memory we should release pack windows if zlib's inflateInit fails due to an out of memory error. It may be that we are running under a low ulimit and are getting tight on address space. Shedding unused windows may get us sufficient working space to continue. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> c734bfde4ba603320784672510a282257e6b82f8 R. Tyler Ballance tyler@slide.com ffa646d85d9c6ae5097acc4455f305e954c76007 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/ca84fcf081d6a7db35453378270e2a7153397ec7 ca84fcf081d6a7db35453378270e2a7153397ec7

2009-01-07T17:57:49-08:00

2009-01-07T17:57:19-08:00

Lower the packedgitlimit from 8G on 64-bit systems to 1G Signed-off-by: R. Tyler Ballance <tyler@slide.com> 843231bd71fa21fffc56fea8c8c061e7d6d37c96 R. Tyler Ballance tyler@slide.com 5d6cce4aba179c47b251a987e36a58d1f2078406 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/ffa646d85d9c6ae5097acc4455f305e954c76007 ffa646d85d9c6ae5097acc4455f305e954c76007

2009-01-06T22:29:06-08:00

2009-01-06T22:28:28-08:00

Properly bump to 256M Signed-off-by: R. Tyler Ballance <tyler@slide.com> 9d0702454aeb2eb1bfe6e03ce4ec6c53f0e31bd2 R. Tyler Ballance tyler@slide.com e3b71b850d64a7a529fee6d17afa667d0e72f45d R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/5d6cce4aba179c47b251a987e36a58d1f2078406 5d6cce4aba179c47b251a987e36a58d1f2078406

2009-01-06T22:29:06-08:00

2009-01-06T22:27:57-08:00

Revert "Bump limit to 256M" Syntax fail This reverts commit 981bae0f7d9fe5ed139bfc5f946422d1ffcb641c. 09c1d085ee5d8060824d8f2203ece002c342fa89 R. Tyler Ballance tyler@slide.com df1536c5d971f840464fdde5b54ddab2785639dd R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/e3b71b850d64a7a529fee6d17afa667d0e72f45d e3b71b850d64a7a529fee6d17afa667d0e72f45d

2009-01-06T22:21:47-08:00

2009-01-06T22:20:36-08:00

Revert "Apply the patch to solve this issue, courtesy of jast in irc.freenode.net#git" This reverts commit 48290d62f26f95ed2d4b784c415cc3ada1c1773a. Signed-off-by: R. Tyler Ballance <tyler@slide.com> 306c3adb3d6f80d69654214e9e04663648b38e04 R. Tyler Ballance tyler@slide.com eb47c59cd2de6d81f5b10cd8e92adb3404b19fe5 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/df1536c5d971f840464fdde5b54ddab2785639dd df1536c5d971f840464fdde5b54ddab2785639dd

2009-01-05T15:34:37-08:00

2009-01-05T15:34:11-08:00

Bump limit to 256M Signed-off-by: R. Tyler Ballance <tyler@slide.com> 34131f70caa1f8d36c02f2b0a2dbc3c6da0bb2da R. Tyler Ballance tyler@slide.com ff09c9f0e14c276db7430c2c2159a0d23e652b47 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/eb47c59cd2de6d81f5b10cd8e92adb3404b19fe5 eb47c59cd2de6d81f5b10cd8e92adb3404b19fe5

2009-01-05T15:34:33-08:00

2009-01-05T15:33:26-08:00

Add kb@'s stupid patch for stupid curl build support Signed-off-by: R. Tyler Ballance <tyler@slide.com> a542b3d277cee9cc99b29b8490e610881a70ce46 R. Tyler Ballance tyler@slide.com 8a1ab3c2447409d6605744f5bc909452602ec25c R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/ff09c9f0e14c276db7430c2c2159a0d23e652b47 ff09c9f0e14c276db7430c2c2159a0d23e652b47

2008-12-26T00:08:28-08:00

2008-11-24T15:36:03-08:00

Reduce window size on 64-bit machines from 1GB to a very conservative 128M to prevent Git from stomping on internal ulimit(3) restrictions cb5773900436239b830ebd32a6484fe5ecc19415 R. Tyler Ballance tyler@slide.com 30610fcb81e1facf4bb7f4e428fa6abcb588014d R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/8a1ab3c2447409d6605744f5bc909452602ec25c 8a1ab3c2447409d6605744f5bc909452602ec25c

2008-12-26T00:08:28-08:00

2008-11-24T16:50:29-08:00

Update the Makefile to skip version generation 3b264eef6934db4d64a3c0c75e1eaff0cf000f43 R. Tyler Ballance tyler@slide.com 8104ebfe8276657ee803cca7eb8665a78cf3ef83 R. Tyler Ballance tyler@slide.com http://github.com/rtyler/slide-git/commit/30610fcb81e1facf4bb7f4e428fa6abcb588014d 30610fcb81e1facf4bb7f4e428fa6abcb588014d

2008-12-26T00:08:28-08:00

2008-12-08T23:26:47-08:00

Apply the patch to solve this issue, courtesy of jast in irc.freenode.net#git xdev3 (master)% git pull . master-topfriends From . * branch master-topfriends -> FETCH_HEAD git push orerror: failed to read delta base object 99b60fe040beed0189b03c33d1c750e864356b33 at offset 1376252850 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack error: failed to read object 579269a0b9ab0694fc1add3c0a83e4329b514d15 at offset 1376253518 from .git/objects/pack/pack-f7eb06e39f01b528c1d1a2c413ac51b31b8515aa.pack fatal: object 579269a0b9ab0694fc1add3c0a83e4329b514d15 is corrupted Merge with strategy recursive failed. xdev3 (master)% Signed-off-by: R. Tyler Ballance <tyler@slide.com> c6a146aae67f591e0e1edbbda2c8ca5e514f0a8c R. Tyler Ballance tyler@slide.com 768c728e7c706ab8d39e0dbf2aa4d1a465930728 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/8104ebfe8276657ee803cca7eb8665a78cf3ef83 8104ebfe8276657ee803cca7eb8665a78cf3ef83

2008-12-24T19:41:08-08:00

GIT 1.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> a2c0eea09a6e5cd565ebd75b77f2634682ef59c7 Junio C Hamano gitster@pobox.com c66c0cbc7e55409ac934b7c6e89aa7aafa74ede4 4fb1a19d502f4a2ca47bfb75cce605f3447819e6 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/768c728e7c706ab8d39e0dbf2aa4d1a465930728 768c728e7c706ab8d39e0dbf2aa4d1a465930728

2008-12-24T00:14:14-08:00

Merge branch 'js/rebase-i-p' * js/rebase-i-p: rebase -i -p: leave a --cc patch when a merge could not be redone rebase -i -p: Fix --continue after a merge could not be redone Show a failure of rebase -p if the merge had a conflict a7d70a6b0a276027339339bdd4511f471c700bee Junio C Hamano gitster@pobox.com f5b49ea6191c2d631d1d70305b25d5db3bf05c92 Johannes Schindelin Johannes.Schindelin@gmx.de http://github.com/rtyler/slide-git/commit/4fb1a19d502f4a2ca47bfb75cce605f3447819e6 4fb1a19d502f4a2ca47bfb75cce605f3447819e6

2008-12-24T00:14:08-08:00

2008-12-22T13:16:51-08:00

rebase -i -p: leave a --cc patch when a merge could not be redone The result is easier to review this way, and the merge resolution has to be done inside the work tree, not by adjusting "the patch" anyway. 0a7fe923328aa0011f7651e9d32b20926b52e590 Junio C Hamano gitster@pobox.com 779e3a8f8b77f4316bb61a8d67b49462b3893632 Miklos Vajna vmiklos@frugalware.org http://github.com/rtyler/slide-git/commit/c66c0cbc7e55409ac934b7c6e89aa7aafa74ede4 c66c0cbc7e55409ac934b7c6e89aa7aafa74ede4

2008-12-22T18:11:33-08:00

2008-12-22T17:09:24-08:00

t9129: skip the last three tests if UTF-8 locale is not available Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> 20ffd0297d5face3c090fdd2ecccf7ac8b55f58e Junio C Hamano gitster@pobox.com f66bc5f928194366ee5eb78ef18a3562fb1bb7cf Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/779e3a8f8b77f4316bb61a8d67b49462b3893632 779e3a8f8b77f4316bb61a8d67b49462b3893632

2008-12-21T19:20:21-08:00

GIT 1.6.1-rc4 Signed-off-by: Junio C Hamano <gitster@pobox.com> b151787a5e086d585460598d07b627f3554628e3 Junio C Hamano gitster@pobox.com 5fdb70983585ccde1540563a8c7458621f7a7407 Richard Hartmann richih.mailinglist@gmail.com http://github.com/rtyler/slide-git/commit/f66bc5f928194366ee5eb78ef18a3562fb1bb7cf f66bc5f928194366ee5eb78ef18a3562fb1bb7cf

2008-12-21T18:46:41-08:00

2008-12-21T15:17:32-08:00

Always show which directory is not a git repository Unify all fatal: Not a git repository error messages so they include path information. Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 02bcca832db8ef7b86094b5cbb5fc11df9d02634 Junio C Hamano gitster@pobox.com 71cbf773df4a339e3534077bc9a0e69875146963 Richard Hartmann richih.mailinglist@gmail.com http://github.com/rtyler/slide-git/commit/5fdb70983585ccde1540563a8c7458621f7a7407 5fdb70983585ccde1540563a8c7458621f7a7407

2008-12-21T18:45:05-08:00

2008-12-21T14:28:25-08:00

Make help entries alphabetical Signed-off-by: Richard Hartmann <richih@net.in.tum.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> d43393c7f88c8690d277adeb17a8ae2bc788a94e Junio C Hamano gitster@pobox.com b80b5d67999dfa5bb1e7ad8ff50142bb371b3746 27c03aafdf29736f889c56777426066c74fa115d Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/71cbf773df4a339e3534077bc9a0e69875146963 71cbf773df4a339e3534077bc9a0e69875146963

2008-12-21T18:35:54-08:00

Merge branch 'maint' * maint: doc/git-fsck: change the way for getting heads' SHA1s c2eb82ef52c9e3eca42e0484f183c7a0b68e34d6 Junio C Hamano gitster@pobox.com d5be89d8ad88792a9716fbfdb499d6d852d0eff5 Boyd Stephen Smith Jr bss@iguanasuicide.net http://github.com/rtyler/slide-git/commit/b80b5d67999dfa5bb1e7ad8ff50142bb371b3746 b80b5d67999dfa5bb1e7ad8ff50142bb371b3746

2008-12-21T18:34:49-08:00

2008-12-21T16:26:03-08:00

git-revert documentation: refer to new HOWTO on reverting faulty merges Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 34a7b18669720d1daed7c6a709245d0bf342fd2f Junio C Hamano gitster@pobox.com 834caf9a7b0850d5647426bcb7c4dae04d85a922 Robin Rosenberg robin.rosenberg.lists@dewire.com http://github.com/rtyler/slide-git/commit/d5be89d8ad88792a9716fbfdb499d6d852d0eff5 d5be89d8ad88792a9716fbfdb499d6d852d0eff5

2008-12-21T18:32:04-08:00

2008-12-21T14:17:12-08:00

git-revert: record the parent against which a revert was made As described in Documentation/howto/revert-a-faulty-merge.txt, re-merging from a previously reverted a merge of a side branch may need a revert of the revert beforehand. Record against which parent the revert was made in the commit, so that later the user can figure out what went on. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> c728462e2f7e21ac04be51bafc9f403d7615e76e Junio C Hamano gitster@pobox.com b3eae84dc10e452add0e79c7373ceee16f73f7f0 e4df519f05ab20eae235968166a17a5a196bc377 Junio C Hamano gitster@pobox.com http://github.com/rtyler/slide-git/commit/834caf9a7b0850d5647426bcb7c4dae04d85a922 834caf9a7b0850d5647426bcb7c4dae04d85a922

2008-12-21T18:31:12-08:00

Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Force the focus to the main window on Windows gitk: Allow unbalanced quotes/braces in commit headers gitk: Update German translation gitk: Mark forgotten strings (header sentence parts in color chooser) for translation gitk: Ensure that "Reset branch" menu entry is enabled gitk: Use check-buttons' -text property instead of separate labels gitk: Map / to focus the search box gitk: Fix bugs in blaming code 72bc41342976321c8d952a40c8379228591f980b Junio C Hamano gitster@pobox.com 61f57cb07d88e06a2027a4a4c571c59d353361a5 Johannes Sixt j6t@kdbg.org http://github.com/rtyler/slide-git/commit/e4df519f05ab20eae235968166a17a5a196bc377 e4df519f05ab20eae235968166a17a5a196bc377

2008-12-21T15:16:18-08:00

2008-12-17T23:30:49-08:00

gitk: Force the focus to the main window on Windows On msysGit, the focus is first on the (Tk) console. This console is then hidden, but keeps the focus. Work around that by forcing the focus onto the gitk window. This fixes msysGit issue 14. Diagnosed and originally fixed by Johannes Schindelin. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> ffd95438a70aaf56ae659e4d2fba1b4db0303148 Paul Mackerras paulus@samba.org 48027a918d89bad6735897a2c3da77c0451a038c Kevin Ballard kevin@sb.org http://github.com/rtyler/slide-git/commit/61f57cb07d88e06a2027a4a4c571c59d353361a5 61f57cb07d88e06a2027a4a4c571c59d353361a5

2008-12-21T15:16:18-08:00

2008-12-18T01:26:48-08:00

gitk: Allow unbalanced quotes/braces in commit headers When parsing commits, gitk treats the headers of the commit as tcl lists. This causes errors if the header contains an unbalanced quote or open brace. Splitting the line on spaces allows us to treat it as a set of words instead of as a tcl list, which prevents errors. Signed-off-by: Kevin Ballard <kevin@sb.org> Signed-off-by: Paul Mackerras <paulus@samba.org> 7433a0aa1a47b6211eadffdfeee11efdfa277713 Paul Mackerras paulus@samba.org 968b016a4a910f5f52149831a5d480851e789bc3 Christian Stimming stimming@tuhh.de http://github.com/rtyler/slide-git/commit/48027a918d89bad6735897a2c3da77c0451a038c 48027a918d89bad6735897a2c3da77c0451a038c

2008-12-21T15:16:18-08:00

2008-12-06T11:49:24-08:00

gitk: Update German translation Attached to avoid whitespace problems. Regards, Christian From 282060ac531fee722142f9d39c4ff29570723cbb Mon Sep 17 00:00:00 2001 From: Christian Stimming <stimming@tuhh.de> Date: Sat, 6 Dec 2008 20:47:15 +0100 Subject: [PATCH 2/2] gitk: Update German translation Merged with most recent "make update-po" result. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> c16512cd91530b86335058630e4cb66b0de29429 Paul Mackerras paulus@samba.org da12e59dd6732f2f6dfe6285193dbebe9cd5a91b Christian Stimming stimming@tuhh.de http://github.com/rtyler/slide-git/commit/968b016a4a910f5f52149831a5d480851e789bc3 968b016a4a910f5f52149831a5d480851e789bc3

2008-12-21T15:16:18-08:00

2008-12-06T11:48:30-08:00

gitk: Mark forgotten strings (header sentence parts in color chooser) for translation Signed-off-by: Paul Mackerras <paulus@samba.org> 61e71ead41c1b6e87ed8e94ade15e34dbe2b6d11 Paul Mackerras paulus@samba.org adcbec13b9bbcb5e4a15de403038ff91d55b7ece Johannes Sixt j6t@kdbg.org http://github.com/rtyler/slide-git/commit/da12e59dd6732f2f6dfe6285193dbebe9cd5a91b da12e59dd6732f2f6dfe6285193dbebe9cd5a91b

2008-12-21T15:16:17-08:00

2008-12-03T04:43:20-08:00

gitk: Ensure that "Reset branch" menu entry is enabled Consider this sequence of events: 1. Detach HEAD and fire up gitk 2. Call the context menu on some commit. Notice that the last menu entry says "Detached HEAD: can't reset" and it is disabled. 3. Now checkout some regular branch (e.g. 'master') using the context menu. 4. Call the context menu again on some commit. Previously, at this point the last menu entry said "Reset master branch to here", but it was still disabled. With this fix it is now enabled again. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> 2ccb3c995628433e00d221bc97dca5e0a4f48b88 Paul Mackerras paulus@samba.org 97bed03448d864f38fac34eacf2fa124df526788 Johannes Sixt j6t@kdbg.org http://github.com/rtyler/slide-git/commit/adcbec13b9bbcb5e4a15de403038ff91d55b7ece adcbec13b9bbcb5e4a15de403038ff91d55b7ece

2008-12-21T15:16:17-08:00

2008-12-02T12:42:16-08:00

gitk: Use check-buttons' -text property instead of separate labels Previously the check-buttons' labels in the Preferences were separate widgets. This had the disadvantage that in order to toggle the check-button with the mouse the check-box had to be clicked. With this change the check-box can also be toggled by clicking the label. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Paul Mackerras <paulus@samba.org> 764974206cf6d81ba04e0f1a431eaad0a42106ec Paul Mackerras paulus@samba.org 9712b81a765978d2770b32bb77d25bfbf05d5eb5 Giuseppe Bilotta giuseppe.bilotta@gmail.com http://github.com/rtyler/slide-git/commit/97bed03448d864f38fac34eacf2fa124df526788 97bed03448d864f38fac34eacf2fa124df526788

2008-12-21T15:16:17-08:00

2008-12-01T17:19:22-08:00

gitk: Map / to focus the search box The / key is often used to initiate searches (less, vim, some web browsers). This changes the binding for the / (slash) key from 'find next' to 'focus the search box' to follow this convention. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> 3800a38fbe37a14877dc8e5686064640c1a4cbcc Paul Mackerras paulus@samba.org 718258e256b74622aa55f5ee0cb9cff4cce6bf9f Markus Heidelberg markus.heidelberg@web.de http://github.com/rtyler/slide-git/commit/27c03aafdf29736f889c56777426066c74fa115d 27c03aafdf29736f889c56777426066c74fa115d

2008-12-21T12:04:12-08:00

2008-12-21T08:30:22-08:00

doc/git-fsck: change the way for getting heads' SHA1s The straightforward way with using 'cat .git/refs/heads/*' doesn't work with packed refs as well as branches of the form topic/topic1. So let's use git-for-each-ref for getting the heads' SHA1s in this example. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 3f8840dee3f18c6956e12b44daa19d15b87f4371 Junio C Hamano gitster@pobox.com