| de3a5c6 | Junio C Hamano | 17 May 2013, 19:19:20 UTC | Git 1.8.3-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 19:19:20 UTC |
| 680ed3e | Junio C Hamano | 17 May 2013, 19:16:49 UTC | Merge branch 'fc/doc-style' * fc/doc-style: documentation: trivial style cleanups | 17 May 2013, 19:16:49 UTC |
| 8639f3e | Junio C Hamano | 17 May 2013, 19:16:44 UTC | Merge branch 'dw/asciidoc-sources-are-dot-txt-files' * dw/asciidoc-sources-are-dot-txt-files: CodingGuidelines: Documentation/*.txt are the sources | 17 May 2013, 19:16:44 UTC |
| 0460ed2 | Felipe Contreras | 09 May 2013, 01:16:55 UTC | documentation: trivial style cleanups White-spaces, missing braces, standardize --[no-]foo. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 19:09:21 UTC |
| e86d0a3 | Junio C Hamano | 17 May 2013, 18:55:02 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Update Swedish translation (304t) | 17 May 2013, 18:55:02 UTC |
| 1f197a1 | John Keeping | 17 May 2013, 18:26:08 UTC | difftool: fix dir-diff when file does not exist in working tree Commit 02c5631 (difftool --dir-diff: symlink all files matching the working tree, 2013-03-14) does not handle the case where a file that is being compared does not exist in the working tree. Fix this by checking for existence explicitly before running git-hash-object. Reported-by: Kevin Bracey <kevin@bracey.fi> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 18:46:53 UTC |
| 31eb360 | Felipe Contreras | 17 May 2013, 17:10:19 UTC | remote-bzr: fixes for older versions of bzr Down to v2.0, by using older but still valid interfaces. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 18:43:36 UTC |
| a70ae58 | Sandor Bodo-Merle | 17 May 2013, 10:32:28 UTC | remote-bzr: fix old organization destroy Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 May 2013, 17:59:08 UTC |
| 9aa66a0 | Peter Krefting | 16 May 2013, 07:14:35 UTC | gitk: Update Swedish translation (304t) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Paul Mackerras <paulus@samba.org> | 16 May 2013, 23:25:25 UTC |
| 629b60a | Felipe Contreras | 16 May 2013, 12:43:15 UTC | Revert "remote-hg: update bookmarks when pulling" This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. Different versions of Mercurial have different arguments for bookmarks.updatefromremote(), while it should be possible to call the right function with the right arguments depending on the version, it's safer to restore the old behavior for now. Reported by Rodney Lorrimar. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 22:54:18 UTC |
| 3244eb9 | Dale R. Worley | 15 May 2013, 22:28:39 UTC | git-submodule.txt: Clarify 'init' and 'add' subcommands. Describe how 'add' sets the submodule's logical name, which is used in the configuration entry names. Clarify that 'init' only sets up the configuration entries for submodules that have already been added elsewhere. Describe that <path> arguments limit the submodules that are configured. Signed-off-by: Dale Worley <worley@ariadne.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 19:01:31 UTC |
| 4f4e7e9 | Felipe Contreras | 16 May 2013, 10:04:05 UTC | remote-bzr: fix cloning of non-listable repos Commit 95b0c60 (remote-bzr: add support for bzr repos) introduced a regression by assuming all bzr remote repos are listable, but they are not. If they are not listable they are basically useless, so let's assume there is no bzr repo. Reported-by: Thorsten Kranzkowski <dl8bcu@dl8bcu.de> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 May 2013, 16:29:26 UTC |
| 0c2b1cf | Junio C Hamano | 15 May 2013, 21:58:56 UTC | Merge branch 'fc/remote-hg' (early part) * 'fc/remote-hg' (early part): remote-hg: update bookmarks when pulling remote-hg: don't push fake 'master' bookmark remote-hg: disable forced push by default remote-hg: fix new branch creation remote-hg: add new get_config_bool() helper remote-hg: enable track-branches in hg-git mode remote-hg: get rid of unused exception checks remote-hg: trivial cleanups | 15 May 2013, 21:58:56 UTC |
| 24317ef | Felipe Contreras | 14 May 2013, 04:36:31 UTC | remote-hg: update bookmarks when pulling Otherwise, the user would never ever see new bookmarks, only the ones that (s)he initially cloned. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:41:13 UTC |
| 9ed920a | Felipe Contreras | 14 May 2013, 04:36:30 UTC | remote-hg: don't push fake 'master' bookmark We skip it locally, but not for the remote, so let's do so. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:40:59 UTC |
| 06f4213 | Felipe Contreras | 14 May 2013, 04:36:29 UTC | remote-hg: disable forced push by default In certain situations we might end up pushing garbage revisions (e.g. in a rebase), and the patches to deal with that haven't been merged yet. So let's disable forced pushes by default. We are essentially reverting back to the old v1.8.2 behavior, to minimize the possibility of regressions, but in a way the user can configure. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:40:16 UTC |
| 6373336 | Felipe Contreras | 14 May 2013, 04:36:28 UTC | remote-hg: fix new branch creation When a user creates a new branch with git: % git checkout -b branches/devel and then pushes this branch % git push origin branches/devel which is the way to push new mercurial branches, we do want to create a branch, but the command would fail without newbranch=True. This only matters when force_push=False, but setting newbranch=True unconditionally does not hurt. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:35:51 UTC |
| 760ee1c | Felipe Contreras | 14 May 2013, 04:36:27 UTC | remote-hg: add new get_config_bool() helper No functional changes. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:33:39 UTC |
| 679e87c | Felipe Contreras | 14 May 2013, 04:36:26 UTC | remote-hg: enable track-branches in hg-git mode The user can turn this off. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:33:15 UTC |
| 557399e | Felipe Contreras | 14 May 2013, 04:36:25 UTC | remote-hg: get rid of unused exception checks Remove try/except check because we are no longer calling check_output(), which may throw an exception. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:31:54 UTC |
| eb7976e | Felipe Contreras | 14 May 2013, 04:36:24 UTC | remote-hg: trivial cleanups Drop unused "global", and remove redundant comparison of two files. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 May 2013, 19:30:36 UTC |
| 6a3ac18 | Felipe Contreras | 14 May 2013, 04:20:27 UTC | remote-bzr: update old organization If a clone exists with the old organization (v1.8.2) it will prevent the new shared bzr repository organization from working, so let's remove this repository, which is not used any more. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 May 2013, 22:51:00 UTC |
| ab84621 | Junio C Hamano | 13 May 2013, 18:09:42 UTC | Git 1.8.3-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2013, 18:09:42 UTC |
| f74455a | Junio C Hamano | 13 May 2013, 14:51:41 UTC | Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: On OSX, bring the gitk window to front gitk: Add support for -G'regex' pickaxe variant gitk: Add menu item for reverting commits gitk: Simplify file filtering gitk: Display the date of a tag in a human-friendly way gitk: Improve behaviour of drop-down lists gitk: Move hard-coded colors to .gitk | 13 May 2013, 14:51:41 UTC |
| 76bf6ff | Tair Sabirgaliev | 24 April 2013, 09:48:27 UTC | gitk: On OSX, bring the gitk window to front On OSX, Tcl/Tk application windows are created behind all the applications down the stack of windows. This is very annoying, because once a gitk window appears, it's the downmost window and switching to it is pain. The patch is: if we are on OSX, use osascript to bring the current Wish process window to front. Signed-off-by: Tair Sabirgaliev <tair.sabirgaliev@gmail.com> Thanks-to: Stefan Haller <lists@haller-berlin.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 May 2013, 11:29:43 UTC |
| c33cb90 | Martin Langhoff | 14 June 2012, 18:34:11 UTC | gitk: Add support for -G'regex' pickaxe variant git log -G'regex' is a very useful alternative to the classic pickaxe. Minimal patch to make it usable from gitk. [zj: reword message] [paulus@samba.org: reword droplist item] Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Paul Mackerras <paulus@samba.org> | 13 May 2013, 11:29:40 UTC |
| 8d97506 | Torsten Bögershausen | 11 May 2013, 13:25:52 UTC | test-bzr: do not use unportable sed '\+' Using sed -e '/[0-9]\+//' to find "one or more digits" is not portable. Use the Basic Regular Expression '/[0-9][0-9]*//' instead. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2013, 19:51:19 UTC |
| 9249175 | Junio C Hamano | 11 May 2013, 18:09:00 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: added an --include-path flag Git::SVN::*: add missing "NAME" section to perldoc git-svn: avoid self-referencing mergeinfo | 11 May 2013, 18:09:00 UTC |
| 8f3ff93 | Knut Franke | 27 April 2013, 14:36:13 UTC | gitk: Add menu item for reverting commits Sometimes it's helpful (at least psychologically) to have this feature easily accessible. Code borrows heavily from cherrypick. Signed-off-by: Knut Franke <Knut.Franke@gmx.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 08:31:50 UTC |
| 2c8cd90 | Felipe Contreras | 27 April 2013, 22:01:39 UTC | gitk: Simplify file filtering git diff is perfectly able to do this with '-- files', no need for manual filtering. This makes gettreediffs consistent with getblobdiffs. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:37:08 UTC |
| 685316c | Anand Kumria | 29 April 2013, 05:20:48 UTC | gitk: Display the date of a tag in a human-friendly way By selecting a tag within gitk you can display information about it. This information is output by using the command 'git cat-file tag <tagid>' This outputs the *raw* information from the tag, amongst which is the time - in seconds since the epoch. As useful as that value is, I find it a lot easier to read and process time which it is something like: "Mon Dec 31 14:26:11 2012 -0800" This change will modify the display of tags in gitk like so: @@ -1,7 +1,7 @@ object 5d417842efeafb6e109db7574196901c4e95d273 type commit tag v1.8.1 -tagger Junio C Hamano <gitster@pobox.com> 1356992771 -0800 +tagger Junio C Hamano <gitster@pobox.com> Mon Dec 31 14:26:11 2012 -0800 Git 1.8.1 -----BEGIN PGP SIGNATURE----- Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:09:27 UTC |
| 39c1269 | Paul Mackerras | 11 May 2013, 07:08:41 UTC | gitk: Improve behaviour of drop-down lists The drop-down lists used for things like the criteria for finding commits (containing/touching paths/etc.) use a combobox if we are using the ttk widgets. By default the combobox exports its value as the selection when it is changed, which is unnecessary, and sometimes the combobox wouldn't release the selection, which is annoying. To fix this, we make these comboboxes not export their selection, and also clear their selection whenever they are changed. This makes them more like a simple selection of alternatives, improving the look and feel of gitk. Signed-off-by: Paul Mackerras <paulus@samba.org> | 11 May 2013, 07:08:41 UTC |
| 48bc175 | Dale Worley | 07 May 2013, 17:39:46 UTC | CodingGuidelines: Documentation/*.txt are the sources People not familiar with AsciiDoc may not realize they are supposed to update *.txt files and not *.html/*.1 files when preparing patches to the project. Signed-off-by: Dale Worley <worley@ariadne.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2013, 19:13:08 UTC |
| b387c77 | Junio C Hamano | 09 May 2013, 20:32:54 UTC | Sync with v1.8.2.3 * maint: Git 1.8.2.3 t5004: avoid using tar for checking emptiness of archive t5004: ignore pax global header file mergetools/kdiff3: do not use --auto when diffing transport-helper: trivial style cleanup | 09 May 2013, 20:32:54 UTC |
| 92758dd | Junio C Hamano | 09 May 2013, 19:37:53 UTC | Git 1.8.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 20:31:17 UTC |
| faf8fde | Junio C Hamano | 09 May 2013, 20:30:19 UTC | Merge branch 'mv/sequencer-pick-error-diag' Fix "git cherry-pick $annotated_tag", which was mistakenly rejected. * mv/sequencer-pick-error-diag: cherry-pick: picking a tag that resolves to a commit is OK | 09 May 2013, 20:30:19 UTC |
| 7c0b0d8 | Junio C Hamano | 09 May 2013, 20:27:49 UTC | cherry-pick: picking a tag that resolves to a commit is OK Earlier, 21246dbb9e0a (cherry-pick: make sure all input objects are commits, 2013-04-11) tried to catch an unlikely "git cherry-pick $blob" as an error, but broke a more important use case to cherry-pick a tag that points at a commit. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 20:29:53 UTC |
| 07e03d4 | Junio C Hamano | 09 May 2013, 19:42:17 UTC | Merge branch 'tr/copy-revisions-from-stdin' into maint * tr/copy-revisions-from-stdin: read_revisions_from_stdin: make copies for handle_revision_arg | 09 May 2013, 19:42:17 UTC |
| ea2d20d | René Scharfe | 09 May 2013, 13:13:47 UTC | t5004: avoid using tar for checking emptiness of archive Test 2 of t5004 checks if a supposedly empty tar archive really contains no files. 24676f02 (t5004: fix issue with empty archive test and bsdtar) removed our commit hash to make it work with bsdtar, but the test still fails on NetBSD and OpenBSD, which use their own tar that considers a tar file containing only NULs as broken. Here's what the different archivers do when asked to create a tar file without entries: $ uname -v NetBSD 6.0.1 (GENERIC) $ gtar --version | head -1 tar (GNU tar) 1.26 $ bsdtar --version bsdtar 2.8.4 - libarchive 2.8.4 $ : >zero.tar $ perl -e 'print "\0" x 10240' >tenk.tar $ sha1 zero.tar tenk.tar SHA1 (zero.tar) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (tenk.tar) = 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | tar cf - -T - | sha1 da39a3ee5e6b4b0d3255bfef95601890afd80709 $ : | gtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ : | bsdtar cf - -T - | sha1 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c So NetBSD's native tar creates an empty file, while GNU tar and bsdtar both give us 10KB of NULs -- just like git archive with an empty tree. Now let's see how the archivers handle these two kinds of empty tar files: $ tar tf zero.tar; echo $? tar: Unexpected EOF on archive file 1 $ gtar tf zero.tar; echo $? gtar: This does not look like a tar archive gtar: Exiting with failure status due to previous errors 2 $ bsdtar tf zero.tar; echo $? 0 $ tar tf tenk.tar; echo $? tar: Cannot identify format. Searching... tar: End of archive volume 1 reached tar: Sorry, unable to determine archive format. 1 $ gtar tf tenk.tar; echo $? 0 $ bsdtar tf tenk.tar; echo $? 0 NetBSD's tar complains about both, bsdtar happily accepts any of them and GNU tar doesn't like zero-length archive files. So the safest course of action is to stay with our block-of-NULs format which is compatible with GNU tar and bsdtar, as we can't make NetBSD's native tar happy anyway. We can simplify our test, however, by taking tar out of the picture. Instead of extracting the archive and checking for the non-presence of files, check if the file has a size of 10KB and contains only NULs. This makes t5004 pass on NetBSD and OpenBSD. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 19:41:31 UTC |
| abdb9b2 | René Scharfe | 09 May 2013, 13:10:48 UTC | t5004: ignore pax global header file Versions of tar that don't know pax headers -- like the ones in NetBSD 6 and OpenBSD 5.2 -- extract them as regular files. Explicitly ignore the file created for our global header when checking the list of extracted files, as this is normal and harmless fall-back behaviour. This fixes test 3 of t5004 on these platforms. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 19:18:57 UTC |
| e2161bc | David Aguilar | 09 May 2013, 09:13:28 UTC | mergetools/kdiff3: do not use --auto when diffing The `kdiff3 --auto` help message is, "No GUI if all conflicts are auto- solvable." This flag was carried over from the original mergetool commands. diff_cmd() is for two-way comparisons only so remove the superfluous flag. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 18:59:39 UTC |
| b120ef3 | Felipe Contreras | 09 May 2013, 01:16:56 UTC | transport-helper: trivial style cleanup Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 May 2013, 18:33:01 UTC |
| a7b1023 | Paul Walmsley | 03 May 2013, 23:10:18 UTC | git-svn: added an --include-path flag The SVN::Fetcher module is now able to filter for inclusion as well as exclusion (as used by --ignore-path). Also added tests, documentation changes and git completion script. If you have an SVN repository with many top level directories and you only want a git-svn clone of some of them then using --ignore-path is difficult as it requires a very long regexp. In this case it's much easier to filter for inclusion. [ew: remove trailing whitespace] Signed-off-by: Paul Walmsley <pjwhams@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 09 May 2013, 01:13:36 UTC |
| d301f18 | Jonathan Nieder | 05 May 2013, 07:50:33 UTC | Git::SVN::*: add missing "NAME" section to perldoc lexgrog(1) relies on the NAME section to find a manpage's subject's name and description for easy access later using "man -k". Add the section it expects. Noticed using lintian. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 09 May 2013, 01:07:58 UTC |
| e234ac9 | Michael Contreras | 30 March 2013, 22:06:42 UTC | git-svn: avoid self-referencing mergeinfo When svn.pushmergeinfo is set, the target branch is included in the mergeinfo if it was previously merged into one of the source branches. SVN does not do this. Remove merge target branch path from resulting mergeinfo when svn.pushmergeinfo is set to better match the behavior of SVN. Update the svn-mergeinfo-push test. [ew: 80 columns] Signed-off-by: Michael Contreras <michael@inetric.com> Reported-by: Avishay Lavie <avishay.lavie@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 09 May 2013, 01:07:39 UTC |
| 9b79519 | Junio C Hamano | 08 May 2013, 05:50:05 UTC | Update draft release notes for 1.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2013, 05:50:05 UTC |
| 0df8603 | Felipe Contreras | 07 May 2013, 23:45:15 UTC | remote-helpers: trivial cleanup The comment was copied from hg-fast-export, not used anymore. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2013, 05:42:20 UTC |
| 435f39a | Felipe Contreras | 07 May 2013, 23:39:35 UTC | remote-bzr: fix for disappeared revisions It's possible that the previous tip goes away, we should not assume it's always present. Fortunately we are only using it to calculate the progress to display to the user, so only that needs to be fixed. Also, add a test that triggers this issue. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2013, 05:38:40 UTC |
| 3b892dc | Junio C Hamano | 08 May 2013, 01:24:31 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 44 messages (2080t0f0u) l10n: de.po: translate 44 new messages l10n: Update Vietnamese translation (2080t0f0u) l10n: Update Swedish translation (2080t0f0u) l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed) | 08 May 2013, 01:24:31 UTC |
| 4dcdc3d | Jiang Xin | 13 April 2013, 02:02:43 UTC | l10n: zh_CN.po: translate 44 messages (2080t0f0u) Translate 44 new messages came from git.pot update in c6bc7d4 (l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)) Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 08 May 2013, 00:13:32 UTC |
| a09ab03 | Ralf Thielow | 30 April 2013, 05:38:05 UTC | l10n: de.po: translate 44 new messages Translate 44 new messages came from git.pot update in c6bc7d4 (l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> | 07 May 2013, 17:28:19 UTC |
| 423ecb0 | Junio C Hamano | 07 May 2013, 05:18:25 UTC | Merge branch 'jk/merge-tree-added-identically' * jk/merge-tree-added-identically: merge-tree: handle directory/empty conflict correctly | 07 May 2013, 05:18:25 UTC |
| 94883b4 | John Keeping | 06 May 2013, 15:20:54 UTC | merge-tree: handle directory/empty conflict correctly git-merge-tree causes a null pointer dereference when a directory entry exists in only one or two of the three trees being compared with no corresponding entry in the other tree(s). When this happens, we want to handle the entry as a directory and not attempt to mark it as a file merge. Do this by setting the entries bit in the directory mask when the entry is missing or when it is a directory, only performing the file comparison when we know that a file entry exists. Reported-by: Andreas Jacobsen <andreas@andreasjacobsen.com> Signed-off-by: John Keeping <john@keeping.me.uk> Tested-by: Andreas Jacobsen <andreas@andreasjacobsen.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 May 2013, 05:17:00 UTC |
| bba5367 | Junio C Hamano | 07 May 2013, 05:16:26 UTC | Merge branch 'fc/remote-bzr' * fc/remote-bzr: remote-bzr: avoid bad refs remote-bzr: convert all unicode keys to str remote-bzr: access branches only when needed remote-bzr: delay peer branch usage remote-bzr: iterate revisions properly remote-bzr: improve progress reporting remote-bzr: add option to specify branches remote-bzr: add custom method to find branches remote-bzr: improve author sanitazion remote-bzr: add support for shared repo remote-bzr: fix branch names remote-bzr: add support for bzr repos remote-bzr: use branch variable when appropriate remote-bzr: fix partially pushed merge remote-bzr: fixes for branch diverge remote-bzr: add support to push merges remote-bzr: always try to update the worktree remote-bzr: fix order of locking in CustomTree remote-bzr: delay blob fetching until the very end remote-bzr: cleanup CustomTree | 07 May 2013, 05:16:26 UTC |
| 4c00819 | Felipe Contreras | 04 May 2013, 00:31:07 UTC | remote-bzr: avoid bad refs Versions of fast-export before v1.8.2 throws a bad 'reset' commands because of a behavior in transport-helper that is not even needed. We should ignore them, otherwise we will treat them as branches and fail. This was fixed in v1.8.2, but some people use this script in older versions of git. Also, check if the ref was a tag, and skip it for now. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 May 2013, 01:19:55 UTC |
| 0818112 | Felipe Contreras | 04 May 2013, 00:31:06 UTC | remote-bzr: convert all unicode keys to str Otherwise some versions of bazaar might barf. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2013, 16:18:52 UTC |
| 2be2eb9 | Junio C Hamano | 05 May 2013, 18:12:12 UTC | Merge branch 'fc/push-with-export-reporting-result' * fc/push-with-export-reporting-result: transport-helper: improve push messages | 05 May 2013, 18:12:12 UTC |
| b056620 | Felipe Contreras | 03 May 2013, 23:41:59 UTC | transport-helper: improve push messages If there's already a remote-helper tracking ref, we can fetch the SHA-1 to report proper push messages (as opposed to always reporting [new branch]). The remote-helper currently can specify the old SHA-1 to avoid this problem, but there's no point in forcing all remote-helpers to be aware of git commit ids; they should be able to be agnostic of them. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 May 2013, 18:10:53 UTC |
| 7d3ccdf | Junio C Hamano | 03 May 2013, 22:23:45 UTC | Git 1.8.3-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2013, 22:23:45 UTC |
| 7c2e8fc | Junio C Hamano | 03 May 2013, 22:18:04 UTC | Merge branch 'tr/unpack-entry-use-after-free-fix' * tr/unpack-entry-use-after-free-fix: unpack_entry: avoid freeing objects in base cache | 03 May 2013, 22:18:04 UTC |
| 1c93768 | Junio C Hamano | 03 May 2013, 22:17:38 UTC | Sync with maint * maint: completion: zsh: don't override suffix on _detault Documentation/git-commit: Typo under --edit | 03 May 2013, 22:17:38 UTC |
| 571cdfd | Junio C Hamano | 03 May 2013, 22:12:38 UTC | Merge branch 'tr/remote-tighten-commandline-parsing' into maint * tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs | 03 May 2013, 22:12:38 UTC |
| 49010c3 | Junio C Hamano | 03 May 2013, 22:12:16 UTC | Merge branch 'jn/glossary-revision' into maint * jn/glossary-revision: glossary: a revision is just a commit | 03 May 2013, 22:12:16 UTC |
| 6606a69 | Felipe Contreras | 03 May 2013, 21:35:50 UTC | completion: zsh: don't override suffix on _detault zsh is smart enough to add the right suffix while completing, there's no point in trying to do the same as bash. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 May 2013, 22:10:05 UTC |
| 9a3e36c | Anders Granskogen Bjørnstad | 02 May 2013, 18:24:15 UTC | Documentation/git-commit: Typo under --edit -C takes a commit object, not a file. Signed-off-by: Anders Granskogen Bjørnstad <andersgb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 May 2013, 19:03:40 UTC |
| de0977d | Junio C Hamano | 01 May 2013, 22:32:24 UTC | Update draft release notes to 1.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 22:32:24 UTC |
| e7a3c90 | Marc Branchaud | 29 April 2013, 19:15:04 UTC | Fix grammar in the 1.8.3 release notes. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 22:25:24 UTC |
| c7e2be6 | Junio C Hamano | 01 May 2013, 22:24:15 UTC | Merge branch 'hb/git-pm-tempfile' * hb/git-pm-tempfile: Git.pm: call tempfile from File::Temp as a regular function | 01 May 2013, 22:24:15 UTC |
| d9291ec | Junio C Hamano | 01 May 2013, 22:24:08 UTC | Merge branch 'rs/pp-user-info-without-extra-allocation' * rs/pp-user-info-without-extra-allocation: pretty: remove intermediate strbufs from pp_user_info() pretty: simplify output line length calculation in pp_user_info() pretty: simplify input line length calculation in pp_user_info() | 01 May 2013, 22:24:08 UTC |
| c259a1a | Junio C Hamano | 01 May 2013, 22:24:01 UTC | Merge branch 'tr/remote-tighten-commandline-parsing' * tr/remote-tighten-commandline-parsing: remote: 'show' and 'prune' can take more than one remote remote: check for superfluous arguments in 'git remote add' remote: add a test for extra arguments, according to docs | 01 May 2013, 22:24:01 UTC |
| b9347eb | Junio C Hamano | 01 May 2013, 22:23:56 UTC | Merge branch 'zk/prompt-rebase-step' * zk/prompt-rebase-step: bash-prompt.sh: show where rebase is at when stopped | 01 May 2013, 22:23:57 UTC |
| 674c502 | Jiang Xin | 01 May 2013, 11:49:18 UTC | Merge remote-tracking branch 'vi-vnwildman/master' * vi-vnwildman/master: l10n: Update Vietnamese translation (2080t0f0u) | 01 May 2013, 11:49:18 UTC |
| efc90c7 | Tran Ngoc Quan | 01 May 2013, 07:29:03 UTC | l10n: Update Vietnamese translation (2080t0f0u) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 01 May 2013, 07:29:03 UTC |
| d421c02 | Felipe Contreras | 01 May 2013, 01:10:10 UTC | remote-bzr: access branches only when needed Bazaar doesn't seem to be tested for multiple usage of branches, so resources seem to be leaked all over. Let's try to minimize this by accessing the Branch objects only when needed. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 747c9a3 | Felipe Contreras | 01 May 2013, 01:10:09 UTC | remote-bzr: delay peer branch usage So it doesn't time out. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 38cecbd | Felipe Contreras | 01 May 2013, 01:10:08 UTC | remote-bzr: iterate revisions properly This way we don't need to store the list of all the revisions, which doesn't seem to be very memory efficient with bazaar's design, for whatever reason. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| a397699 | Felipe Contreras | 01 May 2013, 01:10:07 UTC | remote-bzr: improve progress reporting No need to manually count the revisions, and also, this would help to iterate more properly. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 248663c | Felipe Contreras | 01 May 2013, 01:10:06 UTC | remote-bzr: add option to specify branches We might not want all the branches. And branch handling in bazaar is rather tricky, so it's safer to simply specify them. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 850dd25 | Felipe Contreras | 01 May 2013, 01:10:05 UTC | remote-bzr: add custom method to find branches The official method is incredibly inefficient and slow. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 3f6e7c0 | Felipe Contreras | 01 May 2013, 01:10:04 UTC | remote-bzr: improve author sanitazion So that we don't end up with '<None>', and also synchronize it with the one from remote-hg. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| c95c35f | Felipe Contreras | 01 May 2013, 01:10:03 UTC | remote-bzr: add support for shared repo This way all the remotes share the same data, so adding multiple remotes, or renaming them doesn't create extra overhead. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 42b48ef | Felipe Contreras | 01 May 2013, 01:10:02 UTC | remote-bzr: fix branch names When branches have '/' in their name (aka. sub-branches), bazaar seems to choke while creating the new directory. Also, git cannot have both 'foo' and 'foo/bar'. So let's replace slashes with a plus sign. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 95b0c60 | Felipe Contreras | 01 May 2013, 01:10:01 UTC | remote-bzr: add support for bzr repos In bazaar, a repository can contain multiple branches, and previously we were supporting only one branch at a time. Now we fetch them all. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 5df4fad | Felipe Contreras | 01 May 2013, 01:10:00 UTC | remote-bzr: use branch variable when appropriate There should be no functional changes. Basically we want to reserve the 'repo' variable. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| b25df87 | Felipe Contreras | 01 May 2013, 01:09:59 UTC | remote-bzr: fix partially pushed merge If part of the merge was already pushed, we don't have the blob_marks available, however, the commits are already stored in bazaar, so we can use the revision_tree to fetch the contents. We want to do this only when there's no other option. There's no easy way to test this. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| 38e7167 | Felipe Contreras | 01 May 2013, 01:09:58 UTC | remote-bzr: fixes for branch diverge If the branches diverge we want to reset the pointer to where the remote actually is. Since we can access remote branches just as easily as local ones, let's do so. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:47 UTC |
| f38dfc4 | Felipe Contreras | 01 May 2013, 01:09:57 UTC | remote-bzr: add support to push merges In order to do that, we need to store the marks of every file, so that they can be fetched when needed. Unfortunately we can't tell bazaar that nothing changed, we need to send the data so that it can figure it out by itself. And since it will be requesting a bunch of information by the file_id, it's better to have a helper dict (rev_files), so that we can fetch it quickly. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:46 UTC |
| 715d64f | Felipe Contreras | 01 May 2013, 01:09:56 UTC | remote-bzr: always try to update the worktree And fail properly when we can't. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:46 UTC |
| aa12a43 | Felipe Contreras | 01 May 2013, 01:09:55 UTC | remote-bzr: fix order of locking in CustomTree It doesn't seem to make any difference, but revision_tree() requires a lock. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:46 UTC |
| 1816620 | Felipe Contreras | 01 May 2013, 01:09:54 UTC | remote-bzr: delay blob fetching until the very end Might be more efficient, but the real reason to use the marks will be revealed in upcoming patches. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:46 UTC |
| c80f4c7 | Felipe Contreras | 01 May 2013, 01:09:53 UTC | remote-bzr: cleanup CustomTree This code was not used at all. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2013, 05:06:46 UTC |
| 756a042 | Thomas Rast | 30 April 2013, 12:53:06 UTC | unpack_entry: avoid freeing objects in base cache In the !delta_data error path of unpack_entry(), we run free(base). This became a window for use-after-free() in abe601b (sha1_file: remove recursion in unpack_entry, 2013-03-27), as follows: Before abe601b, we got the 'base' from cache_or_unpack_entry(..., 0); keep_cache=0 tells it to also remove that entry. So the 'base' is at this point not cached, and freeing it in the error path is the right thing. After abe601b, the structure changed: we use a three-phase approach where phase 1 finds the innermost base or a base that is already in the cache. In phase 3 we therefore know that all bases we unpack are not part of the delta cache yet. (Observe that we pop from the cache in phase 1, so this is also true for the very first base.) So we make no further attempts to look up the bases in the cache, and just call add_delta_base_cache() on every base object we have assembled. But the !delta_data error path remained unchanged, and now calls free() on a base that has already been entered in the cache. This means that there is a use-after-free if we later use the same base again. So remove that free(); we are still going to use that data. Reported-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2013, 22:43:48 UTC |
| cc7ca63 | Peter Krefting | 30 April 2013, 11:30:21 UTC | l10n: Update Swedish translation (2080t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 30 April 2013, 11:30:21 UTC |
| c6bc7d4 | Jiang Xin | 30 April 2013, 00:31:19 UTC | l10n: git.pot: v1.8.3 round 2 (44 new, 12 removed) Generate po/git.pot from v1.8.3-rc0-19-g7e6a0 for git v1.8.3 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 30 April 2013, 00:31:19 UTC |
| 7e6a0cc | Ramkumar Ramachandra | 29 April 2013, 12:49:41 UTC | git-completion.bash: add remote.pushdefault to config list 224c2171 (remote.c: introduce remote.pushdefault, 2013-04-02) introduced the remote.pushdefault configuration variable, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2013, 16:57:47 UTC |
| 72f7507 | Ramkumar Ramachandra | 29 April 2013, 12:49:40 UTC | git-completion.bash: add branch.*.pushremote to config list 9f765ce (remote.c: introduce branch.<name>.pushremote, 2013-04-02) introduced the configuration variable branch.*.pushremote, but forgot to teach git-completion.bash about it. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2013, 16:57:44 UTC |
| 01449e3 | Junio C Hamano | 29 April 2013, 16:57:38 UTC | Merge branch 'maint' * maint: complete: zsh: use zsh completion for the main cmd complete: zsh: trivial simplification git-completion.bash: complete branch.*.rebase as boolean git-completion.bash: add diff.submodule to config list git-completion.bash: lexical sorting for diff.statGraphWidth | 29 April 2013, 16:57:38 UTC |
| 8301b97 | Junio C Hamano | 29 April 2013, 16:52:18 UTC | Merge branch 'fc/zsh-completion' into maint * fc/zsh-completion: complete: zsh: use zsh completion for the main cmd complete: zsh: trivial simplification | 29 April 2013, 16:52:18 UTC |
| 4911589 | Felipe Contreras | 27 April 2013, 20:34:06 UTC | complete: zsh: use zsh completion for the main cmd So that we can have a nice zsh completion output: % git <tab> add -- add file contents to the index bisect -- find by binary search the change that introduced a bug branch -- list, create, or delete branches checkout -- checkout a branch or paths to the working tree clone -- clone a repository into a new directory commit -- record changes to the repository diff -- show changes between commits, commit and working tree, etc fetch -- download objects and refs from another repository grep -- print lines matching a pattern init -- create an empty Git repository or reinitialize an existing one log -- show commit logs merge -- join two or more development histories together mv -- move or rename a file, a directory, or a symlink pull -- fetch from and merge with another repository or a local branch push -- update remote refs along with associated objects rebase -- forward-port local commits to the updated upstream head reset -- reset current HEAD to the specified state rm -- remove files from the working tree and from the index show -- show various types of objects status -- show the working tree status tag -- create, list, delete or verify a tag object signed with GPG And other niceties, like 'git --git-dir=<tab>' showing only directories. For the rest, the bash completion stuff is still used. Also, add my copyright, since this more than a thin wrapper. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2013, 16:52:06 UTC |
| 1ca6d4b | Felipe Contreras | 27 April 2013, 20:34:05 UTC | complete: zsh: trivial simplification There should be no functional changes. The only reason I wrapped this code around a sub-function is because zsh did the same in it's bashcompinit script in order to declare the special variable 'words' as hidden, but only in this context. There's no need for that any more since we access __git_main directly, so 'words' is not modified, so there's no need for the sub-function. In zsh mode the array indexes are different though. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 April 2013, 16:52:06 UTC |
