This repository has been archived by the owner on Jul 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git does not like --set-upstream and wants --set-upstream-to Signed-off-by: Anas Nashif <[email protected]>
- Loading branch information
Showing
1 changed file
with
26 additions
and
0 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
patches/0001-fix-git-parameter-set-upstream-set-upstream-to.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 972acaccf9764b610aef2a02018b9772133f678d Mon Sep 17 00:00:00 2001 | ||
From: Anas Nashif <[email protected]> | ||
Date: Wed, 19 Sep 2018 22:21:32 -0500 | ||
Subject: [PATCH] fix git parameter --set-upstream -> --set-upstream-to | ||
|
||
Signed-off-by: Anas Nashif <[email protected]> | ||
--- | ||
bitbake/lib/bb/fetch2/git.py | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py | ||
index 1bec60ab71..792c183763 100644 | ||
--- a/bitbake/lib/bb/fetch2/git.py | ||
+++ b/bitbake/lib/bb/fetch2/git.py | ||
@@ -327,7 +327,7 @@ class Git(FetchMethod): | ||
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 %s --set-upstream-to origin/%s" % (ud.basecmd, branchname, \ | ||
branchname), d, workdir=destdir) | ||
else: | ||
runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir) | ||
-- | ||
2.14.4 | ||
|