Attachment 151653 Details for Bug 196745 – patch to update commands for new version of git

patch to update commands for new version of git

file_196745.txt (text/plain), 1.30 KB, created by Steve Wills on 2015-01-15 04:00:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2015-01-15 04:00:12 UTC

Size: 1.30 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile    (revision 376993)
>+++ Makefile    (working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=      qgit
> PORTVERSION=   2.3
>-PORTREVISION=  1
>+PORTREVISION=  2
> CATEGORIES=    devel
> MASTER_SITES=  SF/${PORTNAME}/${PORTNAME}4/${PORTVERSION}
> PKGNAMESUFFIX= -qt4
>Index: files/patch-src_git.cpp
>===================================================================
>--- files/patch-src_git.cpp     (revision 0)
>+++ files/patch-src_git.cpp     (working copy)
>@@ -0,0 +1,20 @@
>+--- src/git.cpp.orig   2009-03-12 17:14:31 UTC
>++++ src/git.cpp
>+@@ -425,7 +425,7 @@ void Git::setTextCodec(QTextCodec* tc) {
>+       if (name == "Big5-HKSCS")
>+               name = "Big5";
>+ 
>+-      run("git repo-config i18n.commitencoding " + name);
>++      run("git config i18n.commitencoding " + name);
>+ }
>+ 
>+ QTextCodec* Git::getTextCodec(bool* isGitArchive) {
>+@@ -435,7 +435,7 @@ QTextCodec* Git::getTextCodec(bool* isGi
>+               return NULL;
>+ 
>+       QString runOutput;
>+-      if (!run("git repo-config --get i18n.commitencoding", &runOutput))
>++      if (!run("git config --get i18n.commitencoding", &runOutput))
>+               return NULL;
>+ 
>+       if (runOutput.isEmpty()) // git docs says default is utf-8

Actions: View

Attachments on bug 196745: 151653