Re: [Bug-wget] [PATCH] GnuTLS certificate loading

[Tim Rühsen]

Am Mittwoch, 7. August 2013, 00:18:25 schrieb Giuseppe Scrivano:
> Hi Tim,
> 
> Tim Rühsen <address@hidden> writes:
> > I don't know what is wrong:
> > 
> > address@hidden:~/src/wget/trunk$ git pull
> > Already up-to-date.
> > address@hidden:~/src/wget/trunk$ git branch --list -a
> > * master
> > 
> >   parallel-wget
> >   remotes/origin/HEAD -> origin/master
> >   remotes/origin/master
> >   remotes/origin/parallel-wget
> > 
> > What can I do ?
> > I admit, that I regularly have problems with syncing repositories (git
> > pull
> > fails, actions with fetch/merge resulting in chaos), ending up in rm -r
> > and
> > git clone.
> 
> how does "git log" look for you?

address@hidden:~/src/wget/trunk$ git log
commit 1194317f35a014c878526dc3d2ada55ebd5fd6de
Author: Tim Ruehsen <address@hidden>
Date:   Sat Aug 3 19:56:39 2013 +0200

    gnutls improvements

commit 76ad566279df2be6ab2229621ecd1f32cbc043a3
Merge: ec04e74 ffb9403
Author: Tim Ruehsen <address@hidden>
Date:   Wed Jul 24 22:44:06 2013 +0200

    Merge branch 'master' of git://git.savannah.gnu.org/wget

commit ec04e74ff893f19b1e885fda24cf4d6f3fe9cd82
Author: Tim Ruehsen <address@hidden>
Date:   Wed Jul 24 22:44:01 2013 +0200

    xxx

commit ffb94036f2116649a8de1a930820056aea9cb65f
Author: Tim Ruehsen <address@hidden>
Date:   Tue Jul 23 15:45:30 2013 +0200

    openssl: fix build.

commit e22095a7641c8a74ed6b3566ad96e2bbb99258c7
Merge: 563cd95 92035db
Author: Tim Ruehsen <address@hidden>
Date:   Tue Jul 23 12:49:12 2013 +0200

    Merge branch 'master' of git://git.savannah.gnu.org/wget
    
    Conflicts:
        configure.ac
        src/http-ntlm.c
        src/http.c

commit 92035dbabd8bb7fc3d10535c97adad2088c9129b
Author: Darshit Shah <address@hidden>                                           
                                             
Date:   Mon Jul 22 19:35:53 2013 +0530                                          
                                               

    Fix erroneous error codes when HTTP Digest Authentication fails.

commit c19d76c02483f070beb688d6fe6f5fafb5674a08
Author: Tim Ruehsen <address@hidden>
Date:   Mon Jul 22 13:12:57 2013 +0200

    ntlm: support libnettle.

commit 563cd95e11abe9ed28b60e3ac00ca09207523ec7
Merge: e296e66 a300f1e
Author: Tim Ruehsen <address@hidden>
Date:   Sun Jul 14 20:08:49 2013 +0200

    Merge branch 'master' of git://git.savannah.gnu.org/wget
    
    Conflicts:
        src/ChangeLog
        src/gnutls.c
        src/http.c

commit e296e66ecc2ec7ce9d4ff935640d169861c77174
Author: Tim Ruehsen <address@hidden>
Date:   Sun Jul 14 19:58:53 2013 +0200

    Check return value of create_authorization_line

commit a300f1e47d12877b13cb661a9742de443232dc1a
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Jul 12 23:44:21 2013 +0200

    Fix some memory leaks a problem introduced with the last commit

commit 72b2c58983a63849acede55b9fc619c76d61bdae
Author: Steven M. Schweda <address@hidden>
Date:   Sat Jul 13 12:00:30 2013 +0200

    warc: Fix some portability issues on VMS.


> What happens if you try these two commands?
> 
> $ git fetch -a
> $ git pull --rebase origin master

address@hidden:~/src/wget/trunk$ git fetch -a
address@hidden:~/src/wget/trunk$ git pull --rebase origin master
>From git://git.savannah.gnu.org/wget
 * branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: add connect timeout to gnutls code
Using index info to reconstruct a base tree...
M       src/ChangeLog
M       src/gnutls.c
Falling back to patching base and 3-way merge...
Auto-merging src/gnutls.c
CONFLICT (content): Merge conflict in src/gnutls.c
Auto-merging src/ChangeLog
CONFLICT (content): Merge conflict in src/ChangeLog
Failed to merge in the changes.
Patch failed at 0001 add connect timeout to gnutls code
The copy of the patch that failed is found in:
   /home/tim/src/wget/trunk/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

[fixed conflicts]

address@hidden:~/src/wget/trunk$ git rebase --continue
src/ChangeLog: needs merge
src/gnutls.c: needs merge
You must edit all merge conflicts and then
mark them as resolved using git add

address@hidden:~/src/wget/trunk$ git add src/ChangeLog src/gnutls.c
address@hidden:~/src/wget/trunk$ git rebase --continue
Applying: add connect timeout to gnutls code
Applying: Check return value of create_authorization_line
Using index info to reconstruct a base tree...
M       src/http.c
<stdin>:24: trailing whitespace.
                                  
warning: 1 line adds whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging src/http.c
CONFLICT (content): Merge conflict in src/http.c
Failed to merge in the changes.
Patch failed at 0002 Check return value of create_authorization_line
The copy of the patch that failed is found in:
   /home/tim/src/wget/trunk/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

address@hidden:~/src/wget/trunk$ git rebase --skip
Applying: xxx
Using index info to reconstruct a base tree...
M       configure.ac
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: gnutls improvements

address@hidden:~/src/wget/trunk$ git log
commit 15015a7e894515f995de0a210856f7369cced7dc
Author: Tim Ruehsen <address@hidden>
Date:   Sat Aug 3 19:56:39 2013 +0200

    gnutls improvements

commit 4766c1935f28afe8ec53780a6580dae7436259fd
Author: Tim Ruehsen <address@hidden>
Date:   Thu Jul 11 14:29:20 2013 +0200

    add connect timeout to gnutls code

commit ffb94036f2116649a8de1a930820056aea9cb65f
Author: Tim Ruehsen <address@hidden>
Date:   Tue Jul 23 15:45:30 2013 +0200

    openssl: fix build.

commit 92035dbabd8bb7fc3d10535c97adad2088c9129b
Author: Darshit Shah <address@hidden>
Date:   Mon Jul 22 19:35:53 2013 +0530

    Fix erroneous error codes when HTTP Digest Authentication fails.

commit c19d76c02483f070beb688d6fe6f5fafb5674a08
Author: Tim Ruehsen <address@hidden>
Date:   Mon Jul 22 13:12:57 2013 +0200

    ntlm: support libnettle.

commit a300f1e47d12877b13cb661a9742de443232dc1a
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Jul 12 23:44:21 2013 +0200

    Fix some memory leaks a problem introduced with the last commit


Do you think, that is ok ?

If yes I would redo like in the example from 'man git-reset':

git reset --soft HEAD^
edit the points you mentioned
git commit -a -C ORIG_HEAD
git format-patch -1

Do you agree ?


Regards, Tim

> 
> 
> Thanks,
> Giuseppe

signature.asc
Description: This is a digitally signed message part.