Attachment 294915 Details for Bug 431173 – fixes git checkout method

[patch] fixes git checkout method

dl-git-fix.patch (text/plain), 1.25 KB, created by Christos Trochalakis on 2008-02-14 15:13:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christos Trochalakis

Created: 2008-02-14 15:13:20 UTC

Size: 1.25 KB

patch

obsolete

>Index: web/flpweb/modules.py
>===================================================================
>RCS file: /cvs/l10n/web/flpweb/modules.py,v
>retrieving revision 1.12
>diff -u -r1.12 modules.py
>--- web/flpweb/modules.py	5 Feb 2008 02:11:17 -0000	1.12
>+++ web/flpweb/modules.py	14 Feb 2008 14:43:39 -0000
>@@ -314,7 +314,7 @@
> 
>         commandList=[]
>         if os.access(os.path.join(localroot, moduledir), os.X_OK | os.W_OK):
>-            commandList.append("cd %(localdir)s && git checkout %(branch)s && git reset --hard && git clean -d && git pull" % {
>+            commandList.append("cd %(localdir)s && git checkout %(branch)s && git fetch origin && git reset --hard origin/%(branch)s" % {
>                 "localdir" : os.path.join(localroot, moduledir),
>                 "branch" : branch,
>                 })
>@@ -328,7 +328,7 @@
>                 "dir" : moduledir,
>                 })
>             # retrieve the specific remote branch
>-            commandList.append("cd %(branchdir)s && git checkout --track -b %(branch)s origin/%(branch)s" % {
>+            commandList.append("cd %(branchdir)s && git branch --track %(branch)s origin/%(branch)s" % {
>                 "branchdir" : os.path.join(localroot, moduledir),
>                 "branch" : branch,
>                 })

Actions: View | Diff

Attachments on bug 431173: 294915