diff options
| author | John Klug <john.klug@multitech.com> | 2018-07-31 17:48:08 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2018-07-31 17:48:08 -0500 |
| commit | b5dd8c128624cb77576d692b68e24691d4d9a96d (patch) | |
| tree | 4a0cc0a718fa98582fd70719a83b826c2d990cf5 /patches/git-branch-set-upstream-to.patch | |
| parent | e08c220730d5da161a746d811268eb1550beb856 (diff) | |
| download | mlinux-b5dd8c128624cb77576d692b68e24691d4d9a96d.tar.gz mlinux-b5dd8c128624cb77576d692b68e24691d4d9a96d.tar.bz2 mlinux-b5dd8c128624cb77576d692b68e24691d4d9a96d.zip | |
mLinux 4
Diffstat (limited to 'patches/git-branch-set-upstream-to.patch')
| -rw-r--r-- | patches/git-branch-set-upstream-to.patch | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/patches/git-branch-set-upstream-to.patch b/patches/git-branch-set-upstream-to.patch new file mode 100644 index 0000000..a4c9996 --- /dev/null +++ b/patches/git-branch-set-upstream-to.patch @@ -0,0 +1,15 @@ +# set-upstream was removed from git in change 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d +# on 2017-08-17 and first introduced in 2.15.0: +# https://git.kernel.org/pub/scm/git/git.git/commit/?h=v2.15.0&id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d +diff -Naru orig/bitbake/lib/bb/fetch2/git.py new/bitbake/lib/bb/fetch2/git.py +--- orig/bitbake/lib/bb/fetch2/git.py 2018-01-05 12:57:04.963756203 -0600 ++++ new/bitbake/lib/bb/fetch2/git.py 2018-01-05 12:57:32.419755391 -0600 +@@ -327,7 +327,7 @@ + branchname = ud.branches[ud.names[0]] + runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ + ud.revisions[ud.names[0]]), d, workdir=destdir) +- runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ ++ runfetchcmd("%s branch --set-upstream-to origin/%s" % (ud.basecmd, \ + branchname), d, workdir=destdir) + else: + runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir) |