Re: [PATCH] Make the global packed_git variable static to sha1_file.c.

2014-02-11 Thread Chris Packham
Hi, On 12/02/14 14:57, Stefan Zager wrote: From b4796d9d99c03b0b7cddd50808a41413e45f1129 Mon Sep 17 00:00:00 2001 From: Stefan Zager sza...@chromium.org Date: Mon, 10 Feb 2014 16:55:12 -0800 Subject: [PATCH] Make the global packed_git variable static to sha1_file.c. This is a first step in

Re: Process of updating a local branch from another with tracking

2014-02-13 Thread Chris Packham
On 13/02/14 10:55, Robert Dailey wrote: I have the following alias defined: sync = !f() { cbr=$(git rev-parse --abbrev-ref HEAD); git co $1 git pull git co $cbr git rebase $1; }; f The goal is to basically update a local branch which tracks a branch on a remote, and then rebase my local

Re: Cygwin + git log = no pager!

2014-02-21 Thread Chris Packham
On 22/02/14 18:18, Robert Dailey wrote: So it seems that the pager doesn't work by default when running `git log` from Cygwin like it does in msysgit for Windows. I know I can pipe to `less` but that requires the additional typing obviously. Does anyone know how I can get the pager to work

Re: Cygwin + git log = no pager!

2014-02-23 Thread Chris Packham
On 24/02/14 09:33, Robert Dailey wrote: On Sat, Feb 22, 2014 at 1:39 AM, Chris Packham judge.pack...@gmail.com wrote: On 22/02/14 18:18, Robert Dailey wrote: So it seems that the pager doesn't work by default when running `git log` from Cygwin like it does in msysgit for Windows. I know I

Re: Cygwin + git log = no pager!

2014-02-26 Thread Chris Packham
On 27/02/14 04:54, Robert Dailey wrote: On Wed, Feb 26, 2014 at 3:26 AM, Jeff King p...@peff.net wrote: On Mon, Feb 24, 2014 at 01:34:34PM -0600, Robert Dailey wrote: So I set GIT_PAGER to 'echo custom pager' as you instructed, and I noticed that wasn't being printed when I ran my git log

[BUGLET] resuming git am when using applypatch-msg hook

2014-03-02 Thread Chris Packham
Hi, I don't know if this really counts as a bug but it is a little annoying from a user experience point of view. We're using an applypatch-msg hook to check that certain things (reviewer, bug entry etc) are recorded correctly in commit messages. My expectation is that if our applypatch-msg hook

Re: New directory lost by git am

2014-03-04 Thread Chris Packham
Hi, On 05/03/14 15:49, Phillip Susi wrote: I applied a patch with git am that adds a new source file to a new directory, and later noticed that file was missing from the commit. It seems that git am fails to add the new file/directory to the index. Could you provide a few more details such

Re: New directory lost by git am

2014-03-05 Thread Chris Packham
On 05/03/14 16:22, Phillip Susi wrote: On 03/04/2014 10:08 PM, Chris Packham wrote: Could you provide a few more details such as your git version (git --version) and an example of the failure. I've tried to reproduce the problem based on the description provided but everything seems to work

[PATCH] Documentation/git-am: Document supported --patch-format options

2014-03-10 Thread Chris Packham
The --patch-format option has been supported for a while but it is not mentioned in the man page and the short help cannot tell the user what the supported formats are. Add the option to the man page along with the supported options. Signed-off-by: Chris Packham judge.pack...@gmail.com --- I've

Re: [PATCH] Documentation/git-am: Document supported --patch-format options

2014-03-16 Thread Chris Packham
On 11/03/14 16:51, Chris Packham wrote: The --patch-format option has been supported for a while but it is not mentioned in the man page and the short help cannot tell the user what the supported formats are. Add the option to the man page along with the supported options. Signed-off

Re: [PATCH] Documentation/git-am: Document supported --patch-format options

2014-03-17 Thread Chris Packham
On 17/03/14 19:39, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: Ping? Hasn't it been already cooking in 'next' for a few days? Indeed I think I missed a What's cooking. Do you want me to submit a fixup for the spelling mistake? -- To unsubscribe from this list

[PATCH] fixup! Documentation/git-am: Document supported --patch-format options

2014-03-17 Thread Chris Packham
--- On 17/03/14 20:35, Chris Packham wrote: On 17/03/14 19:39, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: Ping? Hasn't it been already cooking in 'next' for a few days? Indeed I think I missed a What's cooking. Do you want me to submit a fixup for the spelling

git gui error with relocated repository

2014-04-28 Thread Chris Packham
Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting a new error when I run 'git gui' in a repository with a .git file (created by git submodule). I can send you a screencap of the error message off list if you want but the

Re: git gui error with relocated repository

2014-04-28 Thread Chris Packham
On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting a new error when I run 'git gui' in a repository with a .git file (created by git submodule

[GIT GUI PATCH] git-gui: unconditionally use rev-parse --show-toplevel

2014-04-29 Thread Chris Packham
$GIT_DIR. Unfortunately vsatisfies doesn't handle versions like v2.0.0.rc0 so the fall-back logic is triggered. Given the fact that git 1.7.0 was released over 4 years ago rather than fixing the fall-back logic it seems reasonable to drop the version check. Signed-off-by: Chris Packham judge.pack

material for git training sessions/presentations

2014-05-04 Thread Chris Packham
Hi, I know there are a few people on this list that do git training in various forms. At $dayjob I've been asked to run a few training sessions in house. The initial audience is SW developers so they are fairly clued up on VCS concepts and most have some experience (although some not positive)

Re: git gui error with relocated repository

2014-05-07 Thread Chris Packham
On 07/05/14 00:10, Pat Thoyts wrote: Chris Packham judge.pack...@gmail.com writes: On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which includes gitgui-0.19.0 and I'm getting

Re: git gui error with relocated repository

2014-05-07 Thread Chris Packham
On 07/05/14 19:28, Chris Packham wrote: On 07/05/14 00:10, Pat Thoyts wrote: Chris Packham judge.pack...@gmail.com writes: On Tue, Apr 29, 2014 at 2:56 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Pat, I'm running git 2.0.0-rc0 (haven't got round to pulling down rc1 yet) which

Re: What's cooking in git.git (Apr 2014, #09; Tue, 29)

2014-05-08 Thread Chris Packham
Hi, On 06/05/14 11:50, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Tue, Apr 29, 2014 at 03:38:07PM -0700, Junio C Hamano wrote: * fc/remote-helpers-hg-bzr-graduation (2014-04-29) 11 commits ... Move remote-hg and remote-bzr out of contrib/. There were some

Re: Is there any efficient way to track history of a piece of code?

2014-05-08 Thread Chris Packham
On 08/05/14 18:54, Jianyu Zhan wrote: Usually, a trivial change(like coding style fix) may bury a original change of the code, and thus git blame is of less help. And to address this situation, I have to do like this: git blame -s REF^ file-in-question temp to dig into the history

Re: [BUG] git-gui regression in 2.0rcX within submodule

2014-05-13 Thread Chris Packham
Hi, On 13/05/14 11:45, Yann Dirson wrote: In 2.0rc2, git-gui is unable to work inside submodules, where 1.9.2 did not show such a problem: yann@home:~$ cd /tmp/ yann@home:tmp$ mkdir foo yann@home:tmp$ cd foo/ yann@home:foo$ git init Initialized empty Git repository in /tmp/foo/.git/

Re: [GIT GUI PATCH] git-gui: use vcompare when comparing the git version

2014-05-14 Thread Chris Packham
is tested for another feature. Reported-by: Chris Packham judge.pack...@gmail.com Reported-by: Yann Dirson ydir...@free.fr Signed-off-by: Jens Lehmann jens.lehm...@web.de --- Looks good to me (refer to previous comment about being rusty with tcl). More importantly Tested-by: Chris Packham

Re: [GIT GUI PATCH v2] git-gui: tolerate major version changes when comparing the git version

2014-05-17 Thread Chris Packham
where the git version is tested for another feature. Reported-by: Chris Packham judge.pack...@gmail.com Reported-by: Yann Dirson ydir...@free.fr Helped-by: Pat Thoyts pattho...@users.sourceforge.net Signed-off-by: Jens Lehmann jens.lehm...@web.de --- Am 17.05.2014 14:23, schrieb Pat Thoyts

Sharing merge conflict resolution between multiple developers

2014-08-10 Thread Chris Packham
Hi List, At $dayjob we maintain internal forks of the a number of upstream repositories. Unsurprisingly updating these forks can be extremely problematic, especially when it's only one person doing the merge. Fortunately most of us are in the same physical location so it is possible to drag in

Re: Sharing merge conflict resolution between multiple developers

2014-08-11 Thread Chris Packham
On Tue, Aug 12, 2014 at 6:44 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: Is there any way where we could share the conflict resolution around but still end up with a single merge commit. One idea that immediately comes to me is to use something

[BUG] Hang when I did something a bit weird with submodules

2014-08-18 Thread Chris Packham
Hi, I was just setting up a new project using submodules and have run into what appears to be a hang when git status is invoked. I haven't tried to reproduce this but this is basically what I did (edited highlights from my bash_history). $ git --version git version 2.0.3 $ mkdir proj $ cd

Re: [BUG] Hang when I did something a bit weird with submodules

2014-08-18 Thread Chris Packham
On Tue, Aug 19, 2014 at 4:33 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, I was just setting up a new project using submodules and have run into what appears to be a hang when git status is invoked. I haven't tried to reproduce this but this is basically what I did (edited highlights

Re: Issuing warning when hook does not have execution permission

2014-08-20 Thread Chris Packham
On Wed, Aug 20, 2014 at 4:52 AM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: On Tue, Aug 19, 2014 at 04:05:21PM +1000, Babak M wrote: I saw that if a hook file is present in .git/hooks and it does not have execution permissions it is silently ignored. I thought

Re: [BUG] Hang when I did something a bit weird with submodules

2014-09-02 Thread Chris Packham
On Tue, Aug 19, 2014 at 4:35 PM, Chris Packham judge.pack...@gmail.com wrote: On Tue, Aug 19, 2014 at 4:33 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, I was just setting up a new project using submodules and have run into what appears to be a hang when git status is invoked. I

gitk bug: write commit to file takes commit message from previous commit

2014-09-02 Thread Chris Packham
Hi Paul, Just noticed something in the version of gitk included in git 2.0.3. When I right click on a commit and select write commit to file the resulting file has the diff from the selected commit but the commit message from the previous commit. Attached is an example from running gitk on gitk

Re: gitk bug: write commit to file takes commit message from previous commit

2014-09-02 Thread Chris Packham
On Wed, Sep 3, 2014 at 5:22 PM, Chris Packham judge.pack...@gmail.com wrote: Hi Paul, Just noticed something in the version of gitk included in git 2.0.3. When I right click on a commit and select write commit to file the resulting file has the diff from the selected commit but the commit

[RFC PATCH 0/1] am: bug report and new patch format support

2014-09-03 Thread Chris Packham
changed, 37 insertions(+), 1 deletion(-) Chris Packham (1): am: add gitk patch format -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[RFC PATCH 1/1] am: add gitk patch format

2014-09-03 Thread Chris Packham
-by: Chris Packham judge.pack...@gmail.com --- Documentation/git-am.txt |3 ++- git-am.sh| 35 +++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 9adce37..b59d2b3 100644

Re: [RFC PATCH 1/1] am: add gitk patch format

2014-09-03 Thread Chris Packham
Reviewing my own code. On Wed, Sep 3, 2014 at 9:35 PM, Chris Packham judge.pack...@gmail.com wrote: Patches created using gitk's write commit to file functionality (which uses 'git diff-tree -p --pretty' under the hood) need some massaging in order to apply cleanly. This consists of dropping

Re: [RFC PATCH 0/1] am: bug report and new patch format support

2014-09-03 Thread Chris Packham
On Wed, Sep 3, 2014 at 9:35 PM, Chris Packham judge.pack...@gmail.com wrote: Hi List, When I first tried to apply a patch someone gave me I got the following errors. $ git am patch.patch tr: write error: Broken pipe tr: write error Patch format detection failed. I can't do

[RFC PATCHv2 0/2] am: bug fix and new patch format support

2014-09-03 Thread Chris Packham
'am: avoid re-directing stdin twice' to add some tests and only strip the description part of the patch. Chris Packham (2): am: add gitk patch format am: avoid re-directing stdin twice Documentation/git-am.txt | 3 ++- git-am.sh| 38 +- t

[RFC PATCHv2 2/2] am: avoid re-directing stdin twice

2014-09-03 Thread Chris Packham
pipe tr: write error Patch format detection failed. Cc: Stephen Boyd bebar...@gmail.com Signed-off-by: Chris Packham judge.pack...@gmail.com --- git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-am.sh b/git-am.sh index f979925..5d69c89 100755 --- a/git-am.sh +++ b

[RFC PATCHv2 1/2] am: add gitk patch format

2014-09-03 Thread Chris Packham
-by: Chris Packham judge.pack...@gmail.com --- Documentation/git-am.txt | 3 ++- git-am.sh| 36 t/t4150-am.sh| 13 + 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/Documentation/git-am.txt b/Documentation/git

Re: [RFC PATCHv2 1/2] am: add gitk patch format

2014-09-03 Thread Chris Packham
On Thu, Sep 4, 2014 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: Patches created using gitk's write commit to file functionality (which uses 'git diff-tree -p --pretty' under the hood) need some massaging in order to apply cleanly

Re: [RFC PATCHv2 1/2] am: add gitk patch format

2014-09-04 Thread Chris Packham
Hi Junio, On Fri, Sep 5, 2014 at 5:21 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: Another thing that I've since realised is that this 'gitk' format is also what you've get from git show or git log -p. So this is actually allowing (for better

Re: [RFC PATCHv2 1/2] am: add gitk patch format

2014-09-04 Thread Chris Packham
(added back git ml because I accidentally dropped the Cc when replying to Junio). On Fri, Sep 5, 2014 at 10:57 AM, Junio C Hamano gits...@pobox.com wrote: I doubt that a patchset that does not update mailinfo and mailsplit to extract information and to undo the indentation could be a right

[RFC PATCHv3 0/4] am: patch-format

2014-09-05 Thread Chris Packham
filter programs. Chris Packham (4): am: avoid re-directing stdin twice t/am: add test for stgit patch format t/am: add tests for hg patch format am: add gitk patch format Documentation/git-am.txt | 3 +- git-am.sh| 38 +++- t/t4150-am.sh| 76

[RFC PATCHv3 1/4] am: avoid re-directing stdin twice

2014-09-05 Thread Chris Packham
pipe tr: write error Patch format detection failed. Cc: Stephen Boyd bebar...@gmail.com Signed-off-by: Chris Packham judge.pack...@gmail.com --- Nothing new since http://article.gmane.org/gmane.comp.version-control.git/256425 git-am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[RFC PATCHv3 4/4] am: add gitk patch format

2014-09-05 Thread Chris Packham
-by: Chris Packham judge.pack...@gmail.com --- This hasn't materially changed from the version Junio expressed reservations about[1]. It solves my immediate problem but perhaps this (as well as stgit and hg) belong as external filters in a pipeline before git am. Or maybe mailsplit should absorb

[RFC PATCHv3 2/4] t/am: add test for stgit patch format

2014-09-05 Thread Chris Packham
This adds a tests which exercise the detection of the stgit format. There is a current know breakage in that the code that deals with stgit in split_patches can't handle reading from stdin. Signed-off-by: Chris Packham judge.pack...@gmail.com --- t/t4150-am.sh | 27 +++ 1

[RFC PATCHv3 3/4] t/am: add tests for hg patch format

2014-09-05 Thread Chris Packham
This adds a tests which exercise the detection of the hg format. As with stgit there is a current know breakage in where split_patches can't handle reading from stdin with these patch formats. Cc: Giuseppe Bilotta giuseppe.bilo...@gmail.com Signed-off-by: Chris Packham judge.pack...@gmail.com

Re: [RFC PATCHv3 1/4] am: avoid re-directing stdin twice

2014-09-05 Thread Chris Packham
On Sat, Sep 6, 2014 at 8:26 AM, Johannes Sixt j...@kdbg.org wrote: Am 05.09.2014 12:06, schrieb Chris Packham: In check_patch_format we feed $1 to a block that attempts to determine the patch format. Since we've already redirected $1 to stdin there is no need to redirect it again when we

Re: [RFC PATCHv2 1/2] am: add gitk patch format

2014-09-05 Thread Chris Packham
On Sat, Sep 6, 2014 at 6:29 AM, Junio C Hamano gits...@pobox.com wrote: Chris Packham judge.pack...@gmail.com writes: So teaching git mailinfo to do s/^// (either when asked to or using some heuristic) would be a better approach? I also think we should accept Author: as an acceptable

Re: [TOY PATCH]: rebase: Add --show-files option

2014-10-03 Thread Chris Packham
Hi, On Fri, Oct 3, 2014 at 5:42 PM, Nazri Ramliy ayieh...@gmail.com wrote: Hi, When working on a new feature branch that touches a lot of files I tend to make commits that affect only single files, and for very small changes. Since at this stage I'm experimentating a lot - trying out ideas,

[gitk PATCH] gitk: Default wrcomcmd to use --pretty=email

2014-11-02 Thread Chris Packham
This makes the Write commit to file context menu option generate a file that is consumable by 'git am'. Signed-off-by: Chris Packham judge.pack...@gmail.com --- Hi Paul, This is the other side of a git patch I was looking at a while ago[1]. The basic problem was people were using gitk's Write

Re: Odd git am behavior rewriting subject, adding ASoC: prefix

2014-11-05 Thread Chris Packham
On Wed, Nov 5, 2014 at 2:12 PM, Joe Perches j...@perches.com wrote: I have a patch file created by git format-patch. Applying it via git am changes the subject prefix. Anyone know why? $ git --version git version 2.1.2 $ git am -i 0002-staging-ft1000-Logging-message-neatening.patch

Re: [PATCH] submodule: prevent warning in summary output

2013-08-19 Thread Chris Packham
Hi Brian, On 19/08/13 05:31, brian m. carlson wrote: When git submodule summary is run and there is a deleted submodule, there is an warning from git rev-parse: fatal: Not a git repository: '.vim/pathogen/.git' Silence this warning, since it is fully expected that a deleted submodule

Re: [PATCH v2] submodule: prevent warning in summary output

2013-08-26 Thread Chris Packham
Hi Brian, Sorry for the delay. On 20/08/13 12:26, brian m. carlson wrote: When git submodule summary is run and there is a deleted submodule, there is an warning from git rev-parse: fatal: Not a git repository: '.vim/pathogen/.git' Silence this warning, since it is fully expected

Re: Eclipse

2013-08-28 Thread Chris Packham
Hi Ron, On 28/08/13 03:10, Ron Tregaskis - NOAA Federal wrote: Does git work with Eclipse? Ron -- Eclipse does have git integration courtesy of the EGit plugin. At $dayjob most of us are running eclipse 3.7 a.k.a Indigo. When we started with an earlier eclipse version we had to install the

[Bug?] MERGE_HEAD lost with git checkout master

2013-09-04 Thread Chris Packham
Hi, At $dayjob we have some simple code quality checks that we run to make sure that things are heading in the right direction. These are usually run as part of our automated builds but people occasionally run them when merging updates from other teams or preparing to merge to the integration

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Chris Packham
On 10/09/13 21:19, Matthieu Moy wrote: Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when writting

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Chris Packham
On Tue, Sep 10, 2013 at 11:04 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Chris Packham judge.pack...@gmail.com writes: On 10/09/13 21:19, Matthieu Moy wrote: Hi, I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty

Fwd: [BUG?] fetching via file:// vs ssh://

2012-08-09 Thread Chris Packham
. Even better the tab completion works! On Aug 9, 2012 5:44 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, At $dayjob we have backups setup for developers using a post-commit hook that rsyncs the local .git directory to a backup server. The advantage we get of using rsync instead of git

Ambiguous date handling

2012-09-12 Thread Chris Packham
Hi, I think this has come up before [1],[2] but we ran into this at $dayjob today. Our default MUA has an annoying habit of using a non RFC822 date format when saving an email as plaintext. This means the first 12 days of every month we run into the ambiguous date problem (our date convention is

[PATCH] Add test for ambiguous patch dates

2012-09-12 Thread Chris Packham
-- This testcase is only good for the next couple of months. For a longer term test the current time would need to be set in the test setup. --- t/t4255-am-author-date.sh | 85 + 1 file changed, 85 insertions(+) create mode 100755

Re: Ambiguous date handling

2012-09-12 Thread Chris Packham
On 09/12/2012 09:48 PM, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: Our default MUA has an annoying habit of using a non RFC822 date format when saving an email as plaintext. This means the first 12 days of every month we run into the ambiguous date problem (our date

[RFC/PATCH] submodule: add 'exec' option to submodule update

2013-06-28 Thread Chris Packham
This allows the user some finer grained control over how the update is done. The primary motivation for this was interoperability with stgit however being able to intercept the submodule update process may prove useful for integrating or extending other tools. Signed-off-by: Chris Packham

Re: [RFC/PATCH] submodule: add 'exec' option to submodule update

2013-06-29 Thread Chris Packham
On 28/06/13 22:42, Fredrik Gustafsson wrote: Hi, On Fri, Jun 28, 2013 at 09:53:10PM +1200, Chris Packham wrote: This allows the user some finer grained control over how the update is done. The primary motivation for this was interoperability with stgit however being able to intercept

Re: [RFC/PATCH] submodule: add 'exec' option to submodule update

2013-07-01 Thread Chris Packham
On 01/07/13 03:30, Jens Lehmann wrote: Am 29.06.2013 11:11, schrieb Chris Packham: On 28/06/13 22:42, Fredrik Gustafsson wrote: technically it looks fine to me (except for the lack of tests) but I'm not sure I follow the use case. In your case, you want to run a script to determinate

[RFC/PATCHv2] submodule: add ability to configure update command

2013-07-01 Thread Chris Packham
the submodule update process may prove useful for integrating or extending other tools. Signed-off-by: Chris Packham judge.pack...@gmail.com --- On 01/07/13 03:30, Jens Lehmann wrote: Hmm, if we go that route, why not do the same we do for aliases? If the submodule.*.update setting is prefixed

Re: [RFC/PATCHv2] submodule: add ability to configure update command

2013-07-02 Thread Chris Packham
On 02/07/13 04:48, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: +!*) +command=$(expr $update_module : '!\(.*\)') command=${command#!} Thanks, expr was my attempt to avoid using a ${command:1} bash-ism. v3

[RFC/PATCHv3] submodule update: allow custom update command

2013-07-02 Thread Chris Packham
the submodule update process may prove useful for integrating or extending other tools. Signed-off-by: Chris Packham judge.pack...@gmail.com --- v3 updated as per Junio's review. Still needs tests. Any suggestions? I've been manually testing by setting submodule.$name.update to '!echo'. I haven't

Re: [RFC/PATCHv3] submodule update: allow custom update command

2013-07-02 Thread Chris Packham
On Wed, Jul 3, 2013 at 4:56 AM, Jens Lehmann jens.lehm...@web.de wrote: Am 02.07.2013 12:12, schrieb Chris Packham: --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -159,7 +159,9 @@ update:: This will make the submodules HEAD be detached unless `--rebase

Re: [RFC/PATCHv3] submodule update: allow custom update command

2013-07-03 Thread Chris Packham
On 03/07/13 18:55, Jens Lehmann wrote: Am 03.07.2013 01:26, schrieb Chris Packham: On Wed, Jul 3, 2013 at 4:56 AM, Jens Lehmann jens.lehm...@web.de wrote: Am 02.07.2013 12:12, schrieb Chris Packham: --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -159,7 +159,9

Re: [RFC/PATCHv3] submodule update: allow custom update command

2013-07-03 Thread Chris Packham
On 03/07/13 19:54, Chris Packham wrote: On a related note should I be updating Documentation/config.txt as well? Even if it's a statement that this feature exists refer to git-submodule(1) for details. Answering my own question. While 'update' is mentioned it's possible values

[RFC/PATCHv4] submodule update: allow custom update command

2013-07-03 Thread Chris Packham
the submodule update process may prove useful for integrating with or extensions to other tools. Signed-off-by: Chris Packham judge.pack...@gmail.com --- v4 adds a couple of simple tests - an equivalent of update=checkout and a test to make sure we detect a failure reported by the update command

Re: [PATCH] Remove the suggestion to use parsecvs, which is currently broken.

2013-01-01 Thread Chris Packham
Minor typo On 12/29/2012 05:20 AM, Eric S. Raymond wrote: The parsecvs code has been neglected for a long time, and the only public version does not even build correctly. I have been handed control of the project and intend to fix this, but until I do it cannot be recommended. Also, the

state of the art with moving submodules

2013-02-26 Thread Chris Packham
Hi Jens, (sorry for the dup. gmail insists on sending html) I know I saw a few threads regarding support for moving submodules but I lost track of the discussion. At $dayjob we were discussing a potential re-org of our super-projects to introduce a bit of hierarchy to the submodules (at the

Re: Fwd: Uninit'ed submodules

2013-05-07 Thread Chris Packham
On 07/05/13 07:16, Jens Lehmann wrote: Am 06.05.2013 02:19, schrieb Chris Packham: This did get me thinking. Why does an uninitialized submodule need to have an empty directory? If it didn't the maintainer in question probably would have realized that he needed to run git submodule update

Re: [PATCH 3/3] git submodule update should give notice when run without init beforehand

2013-09-19 Thread Chris Packham
On 18/09/13 22:22, Tay Ray Chuan wrote: Hi Chris, I think you mentioned usability issues with git-submodule before on the git mailing list, so I thought you might be interested in taking a look at this patch. It's attached below, you can also view it at

Re: Command-line git Vs IDE+plugin?

2013-12-04 Thread Chris Packham
On 19/11/13 06:11, Matthieu Moy wrote: I was wondering whether others had similar (or not) experience. In particular, as a teacher, I'm wondering whether I should push my students towards the GUI in the IDE, or advise them to keep using the command-line (we teach them git with the command-line

Re: A couple of rebase --autosquash proposals

2013-12-09 Thread Chris Packham
On 09/12/13 19:51, Johannes Sixt wrote: Am 12/9/2013 3:23, schrieb Brett Randall: * fixup! or squash! on it's own would default to fixing-up the previous commit (or result of previous step of rebase if that was a squash/fixup). Why would you want that? To fixup the previous commit, just use

Re: [PATCH] wording fixes in the user manual and glossary

2014-05-25 Thread Chris Packham
On 25/05/14 15:50, Jeremiah Mahler wrote: Some minor wording fixes in the user manual and glossary. Signed-off-by: Jeremiah Mahler jmmah...@gmail.com --- Documentation/glossary-content.txt | 2 +- Documentation/user-manual.txt | 8 2 files changed, 5 insertions(+), 5

Re: [PATCH] wording fixes in the user manual and glossary

2014-05-26 Thread Chris Packham
On 25/05/14 20:37, Jeremiah Mahler wrote: On Sun, May 25, 2014 at 07:56:41PM +1200, Chris Packham wrote: On 25/05/14 15:50, Jeremiah Mahler wrote: Some minor wording fixes in the user manual and glossary. ... -Eventually the developer cloned from will do additional work in her +Eventually

Re: [PATCH 1/5] progress.c: replace signal() with sigaction()

2014-05-28 Thread Chris Packham
On 28/05/14 18:14, Jeremiah Mahler wrote: From signal(2) The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. See Portability below. Minor nit. The last sentence

Re: [PATCH 0/5] replace signal() with sigaction()

2014-05-28 Thread Chris Packham
On 28/05/14 19:40, Johannes Sixt wrote: Am 5/28/2014 8:14, schrieb Jeremiah Mahler: From signal(2) The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. See Portability

Re: .gitmodules containing SSH clone URLs should fall back to HTTPS when SSH key is not valid/existent

2014-05-29 Thread Chris Packham
On Fri, May 30, 2014 at 11:12 AM, Jonathan Leonard johana...@gmail.com wrote: But you do not give much information about your special use case. I assume you have submodule repositories for which some developers have a valid ssh key and others don't (maybe because they should only have read

Re: [PATCH v2 2/2] connect.c: replace signal() with sigaction()

2014-05-31 Thread Chris Packham
On 31/05/14 08:58, Jeremiah Mahler wrote: From signal(2) man page: The behavior of signal() varies across UNIX versions, and has also var‐ ied historically across different versions of Linux. Avoid its use: use sigaction(2) instead. Replaced signal() with sigaction() in

[RFC PATCH] clone: add clone.recursesubmodules config option

2014-06-04 Thread Chris Packham
Add a config option that will cause clone to recurse into submodules as if the --recurse-submodules option had been specified on the command line. This can be overridden with the --no-recurse-submodules option. Signed-off-by: Chris Packham judge.pack...@gmail.com --- On 04/06/14 09:05, Junio C

Re: [RFC PATCH] clone: add clone.recursesubmodules config option

2014-06-05 Thread Chris Packham
On 05/06/14 07:42, Heiko Voigt wrote: On Wed, Jun 04, 2014 at 10:24:06AM -0700, Junio C Hamano wrote: Chris Packham judge.pack...@gmail.com writes: On 04/06/14 09:05, Junio C Hamano wrote: Also, going --recursive when the user did not want is a lot more expensive mistake to fix than

Re: confused about remote branch management

2014-07-23 Thread Chris Packham
On 23/07/14 14:49, Ross Boylan wrote: My local master branch is the result of a merge of upstream master and some local changes. I want to merge in more recent upstream work. git pull doesn't seem to have updated origin/master, and git checkout origin/master also doesn't seem to work.

Re: Git submodule first time update with proxy

2015-01-23 Thread Chris Packham
Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey rcdailey.li...@gmail.com wrote: I have a submodule using HTTP URL. I do this: $ git submodule init MySubmodule $ git submodule update MySubmodule The 2nd command fails because the HTTP URL cannot be resolved, this is because it requires a

Re: [PATCH 1/2] Fixes _is_git

2015-02-05 Thread Chris Packham
+ if {[regexp ^gitdir: (.+)$ $line line link_target]} { 2015-02-03 3:44 UTC-05:00, Chris Packham judge.pack...@gmail.com: It might be simpler to use one of the 'string' commands e.g. string wordend gitdir: I also suspect the string functions would be faster than regexp

Re: [PATCH 1/2] Fixes _is_git

2015-02-03 Thread Chris Packham
Hi Remi, Added Pat Thoyts the git-gui maintainer. (Disclaimer, it's been years since I did anything with Tcl). On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin remiram...@gmail.com wrote: Function _git_dir would previously fail to accept a gitdir: ... file as a valid Git repository. ---

Re: [PATCH 2/2] Makes _do_open2 set _gitdir to actual path

2015-02-03 Thread Chris Packham
On Tue, Feb 3, 2015 at 6:24 AM, Remi Rampin remiram...@gmail.com wrote: If _is_git had to follow gitdir: ... files to reach the actual Git directory, we set _gitdir to that final path. --- lib/choose_repository.tcl | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff

Re: Windows Bluescreen

2015-02-12 Thread Chris Packham
issue with windows, but can't find it now. https://github.com/msysgit/git/issues Happy hunting :). Actually if it is a ssh problem it might be a generic MSYS issue. So there's another bug tracker to look through http://sourceforge.net/p/mingw/bugs/ On Wed, Feb 11, 2015 at 3:56 AM, Chris Packham

Re: [PATCH 2/2] test-lib.sh: Dynamic test for the prerequisite SANITY

2015-01-27 Thread Chris Packham
Minor typo in a comment. On Wed, Jan 28, 2015 at 4:39 AM, Torsten Bögershausen tbo...@web.de wrote: The SANITY precondition was not set when running as root, but this is not 100% reliable for CYGWIN: A file may be allowed to be deleted when the containing directory does not have write

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Chris Packham
Hi, On Thu, Jan 29, 2015 at 8:49 AM, Dick d...@mrns.nl wrote: Hi all, I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the blessed repository and pushes to the developer public repository. When the blessed repository has

Re: git loses commits on git pull --rebase with Dictator and Lieutenants Workflow

2015-01-29 Thread Chris Packham
On Fri, Jan 30, 2015 at 6:27 AM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Thu, Jan 29, 2015 at 8:49 AM, Dick d...@mrns.nl wrote: Hi all, I've encountered a problem with the Dictator and Lieutenants Workflow. I've configured remote origin so it pulls from the blessed repository

Re: Git submodule first time update with proxy

2015-01-23 Thread Chris Packham
On Sat, Jan 24, 2015 at 5:45 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Jan 23, 2015 at 10:23 PM, Robert Dailey rcdailey.li...@gmail.com wrote: On Fri, Jan 23, 2015 at 4:13 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Fri, Jan 23, 2015 at 3:50 PM, Robert Dailey

Re: [git-gui] bug report: Open existing repository dialog fails on submodules

2015-02-02 Thread Chris Packham
does not handle a gitfiles which have been used for submodules for some time. Instead of using a custom function let's just ask git rev-parse. Signed-off-by: Chris Packham chris.pack...@alliedtelesis.co.nz --- lib/choose_repository.tcl | 15 --- 1 file changed, 4 insertions(+), 11

Re: [git-gui] bug report: Open existing repository dialog fails on submodules

2015-02-02 Thread Chris Packham
On Mon, Feb 2, 2015 at 9:41 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, On Sat, Jan 31, 2015 at 10:46 AM, Rémi Rampin remiram...@gmail.com wrote: Hi, This bug report concerns git-gui. Apologies if this is not the right mailing-list. By submodule I mean a repository for which .git

Re: [PATCH] INSTALL: minor typo fix

2015-01-27 Thread Chris Packham
On Wed, Jan 28, 2015 at 6:09 AM, Chris Packham judge.pack...@gmail.com wrote: Hi Alexander On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1

Re: [PATCH] INSTALL: minor typo fix

2015-01-27 Thread Chris Packham
Hi Alexander On Wed, Jan 28, 2015 at 5:15 AM, Alexander Kuleshov kuleshovm...@gmail.com wrote: Signed-off-by: Alexander Kuleshov kuleshovm...@gmail.com --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index ffb071e..6f1c3d5 100644 ---

Re: Windows Bluescreen

2015-02-11 Thread Chris Packham
Hi Erik, On Tue, Feb 10, 2015 at 9:12 AM, e...@aercon.net wrote: I find that preview 1.8 is bluescreening on about 1 of 3 ssh pushes. 1.9 preview 12-17-2014 doesn't even bluescreen, the windows gui locks until reset. Does this mean that pushing over git:// file:// and http:// are

  1   2   >