headers
Alex Riesen | 5 Dec 01:34

[PATCH 1/3] Make some of fwrite/fclose/write/close failures visible

So that full filesystem conditions or permissions problems wont go
unnoticed.

Signed-off-by: Alex Riesen <raa.lkml <at> gmail.com>
---

This and the follow-up patches is fallout of Windows debugging
sessions. I implemented random error handling code just to figure out
where it might be going wrong. None of that code actually helped to
fix something (and lots was just thrown away), but some, I think,
still makes sense.

This patch adds error handling only to fwrite/fputs where the return
value was ignored and writing was definitely into a file. BTW, libc
headers in Ubuntu 8.10 have warn_unused_result attribute added to many
functions (fwrite(3) and write(2) amongst them). This helps finding
the problem places.

 builtin-fsck.c  |    8 ++++++--
 builtin-merge.c |    6 ++++--
 rerere.c        |   46 +++++++++++++++++++++++++++++++++++-----------
 3 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/builtin-fsck.c b/builtin-fsck.c
index d3f3de9..afded5e 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -201,12 +201,16 @@ static void check_unreachable_object(struct object *obj)
 				char *buf = read_sha1_file(obj->sha1,
 						&type, &size);
(Continue reading)

Permalink | Reply | 2 comments |
headers
Junio C Hamano | 5 Dec 01:11
Favicon
Gravatar

Re: [PATCH] Allow passing of --directory to git-am.

Simon 'corecode' Schubert <corecode <at> fs.ei.tum.de> writes:

> Junio C Hamano wrote:
>> Simon 'corecode' Schubert <corecode <at> fs.ei.tum.de> writes:
>>
>>> You mean not storing/restoring the flags across an invocation?  No,
>>> that's a different thing.  My patch only adds the --directory option,
>>> it does not fix the previously existing bug.
>>
>> The question is if it _introduces_ a bug that the directory given in the
>> initial invocation of "git am --directory=foo" is lost if an patch does
>> not apply and you need to manually resolve and continue.
>>
>> If it does not introduce such a bug, you do not have the same issue as the
>> old patch.  Otherwise you have the same issue as the old patch.  The
>> question was if you have the same issue or you don't.  Yes?  No?
>
> Yes, that's the issue.  In this regard it behaves bug-compatible with
> the -p and -C options.

If that is the case, and assuming that propagating -C/-p would be a good
idea (which I am not sure yet), the patch I sent out earlier (which was
flawed somewhat; it should use "$git_apply_opt_extra" where it invokes the
"git apply" command) with necessary fix would serve as the basis to
implement --directory=<dir>?
Permalink | Reply | 0 comments |
headers
Jeremy Ramer | 5 Dec 00:58

Re: git-gui: Warn when username and e-mail address is unconfigured?

On Thu, Dec 4, 2008 at 2:34 PM, Junio C Hamano <gitster <at> pobox.com> wrote:
> "Jeremy Ramer" <jdramer <at> gmail.com> writes:
>
>> On Thu, Dec 4, 2008 at 12:04 PM, Sverre Rabbelier <alturin <at> gmail.com> wrote:
>>> On Thu, Dec 4, 2008 at 17:05, Jeremy Ramer <jdramer <at> gmail.com> wrote:
>>>> That's strange. I am using git 1.6.0.4 on cygwin and I get a warning
>>>> message every time I start git gui.  I actually find this really
>>>> annoying and would like a way to turn this warning message off.
>>>
>>> git config --global user.name "Your Name"
>>> git config --global user.email "you <at> example.com"
>>>
>>
>> I have done that.  I still get the warning message every time I start git gui.
>
> I do not use Windows, and I do not run git-gui, so I am guessing only from
> the source.  Are you talking about the message composed by this part?
>
>    # -- Warn the user about environmental problems.  Cygwin's Tcl
>    #    does *not* pass its env array onto any processes it spawns.
>    #    This means that git processes get none of our environment.
>    #
>    if {[is_Cygwin]} {
>            set ignored_env 0
>            set suggest_user {}
>            set msg [mc "Possible environment issues exist.
>
>    The following environment variables are probably
>    going to be ignored by any Git subprocess run
>    by %s:
(Continue reading)

Permalink | Reply | 0 comments |
headers
Junio C Hamano | 4 Dec 23:33
Favicon
Gravatar

Re: [PATCH] Allow passing of --directory to git-am.

Simon 'corecode' Schubert <corecode <at> fs.ei.tum.de> writes:

> You mean not storing/restoring the flags across an invocation?  No,
> that's a different thing.  My patch only adds the --directory option,
> it does not fix the previously existing bug.

The question is if it _introduces_ a bug that the directory given in the
initial invocation of "git am --directory=foo" is lost if an patch does
not apply and you need to manually resolve and continue.

If it does not introduce such a bug, you do not have the same issue as the
old patch.  Otherwise you have the same issue as the old patch.  The
question was if you have the same issue or you don't.  Yes?  No?
Permalink | Reply | 0 comments |
headers
Sverre Rabbelier | 4 Dec 20:04

Re: git-gui: Warn when username and e-mail address is unconfigured?

On Thu, Dec 4, 2008 at 17:05, Jeremy Ramer <jdramer <at> gmail.com> wrote:
> That's strange. I am using git 1.6.0.4 on cygwin and I get a warning
> message every time I start git gui.  I actually find this really
> annoying and would like a way to turn this warning message off.

git config --global user.name "Your Name"
git config --global user.email "you <at> example.com"

--

-- 
Cheers,

Sverre Rabbelier
Permalink | Reply | 1 comment |
headers
Adrian Klingel | 4 Dec 15:53
Favicon

git rebase --continue with goofy error

I am trying so, so hard to rebase a branch with updates made in master:

*********
git rebase master
*********

I get about 20 conflicts back, which I fix and do:

*********
git add *
*********

There were also many, many error messages after the rebase command, eg:

*********
error: test/unit/missing_year_test.rb: already exists in index
error: test/unit/axle_test.rb: already exists in index
error: test/unit/body_style_test.rb: already exists in index
error: test/unit/brake_test.rb: already exists in index
error: test/unit/category_test.rb: already exists in index
error: test/unit/comment_test.rb: already exists in index
error: test/unit/company_comment_test.rb: does not exist in index
error: test/unit/country_test.rb: already exists in index
*********

but I ignore that error, because I have no idea what it means.  If I  
were to guess, I'd say it's trying to copy files from master to my  
current branch.  Of course.

So now I have added my conflict fixes, per the message:
(Continue reading)

Permalink | Reply | 0 comments |
headers
rusland2008 | 4 Dec 16:06
Favicon

Contact!!

Contact!!

1,000,000.00 Euros which has been won  by your E-MAIL Address in our NL Promo AWARD 2008 Do get back to this
office with your requirement info:REF(23341) BATCH(EU084GG)Reply to this  E-mail
Address:Email:interbv01 <at> gmail.comTel:00 31 681 094 539.
Best Regards
Dr.Mark Harris,
Permalink | Reply | 0 comments |
headers
Johannes Schindelin | 4 Dec 15:34

[PATCH] gitk: fix 'can't read "notflag"'


Sometimes, when calling git bisect visualize, parameters including
a "--not" are passed to gitk, triggering an uninitialized-variable bug
introduced in ee66e089(gitk: Make updates go faster).

Noticed by Alejandro Riveira Fernández.

Signed-off-by: Johannes Schindelin <johannes.schindelin <at> gmx.de>
---

	On Wed, 3 Dec 2008, Alejandro Riveira wrote:

	> $ git bisect visualize                                                                  (03-12 12:16)
	> Error in startup script: can't read "notflag": no such variable

	Alejandro was good enough to test this fix.

 gitk-git/gitk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 3353f4a..b18bdf0 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -139,6 +139,7 @@ proc parseviewargs {n arglist} {
     set origargs $arglist
     set allknown 1
     set filtered 0
+    set notflag 0
     set i -1
(Continue reading)

Permalink | Reply | 1 comment |
headers
bhutauman@libero.it | 4 Dec 13:07
Favicon

From: Mrs. Adilah Rahman !!!

From: Mrs. Adilah Rahman !!!

Your email address has been approved on the prestigious Dayzers.
You have won the sum of One Million Euro only.

Contact: Mr.Terere Peters
Tel: +31- 641 449 705
Fax: +31- 847 111 492
claimstaats <at> aim.com

Your email was attached to
Lucky numbers: 9575ty/987
Ticket number: 78057/6544
Reference number: y78467788
Serial numbers: kp2223333

Best Regards,
Mrs. Adilah Rahman 
(Promotions Coordinator)
From: Mrs. Adilah Rahman !!!
Permalink | Reply | 0 comments |
headers
Karl Hasselström | 4 Dec 10:30

Re: [StGit PATCH] Print conflict details with the new infrastructure (bug #11181)

On 2008-12-03 21:38:13 +0000, Catalin Marinas wrote:

> The patch modifies the IndexAndWorkTree.merge() function to display
> pass the conflict information (files) when raising an exception. The
> logic is similar to the one in the old infrastructure.

Looks good. Thanks.

> Signed-off-by: Catalin Marinas <catalin.marinas <at> gmail.com>

Acked-by: Karl Hasselström <kha <at> treskal.com>

--

-- 
Karl Hasselström, kha <at> treskal.com
      www.treskal.com/kalle
Permalink | Reply | 0 comments |
headers
Gary Yang | 4 Dec 03:14
Favicon

How to update the tag to Git server?


I pushed code from my local repository to Git Server.
git push git.company.com:/pub/git/training.git

I, then tagged my local repository.
git tag -u gyang <at> company.com RELEASE_2

I want to update the Git server so that I can have the tag at my Git server, I did:
git push git.company.com:/pub/git/training.git
Everything up-to-date

I got "Everything up-to-date". Same story for the command with -f.
git push -f svdcgit01.amcc.com:/pub/git/training.git

git tag -l
RELEASE_2

From my git server, git.company.com, I cannot see the tag at summary. I need to have the tag, RELEASE_2 at
git.company.com. Can someone tell me how to do it?

Thanks.
Permalink | Reply | 0 comments |

Gmane