From 2a9e2c6a0962cb04a12d833cc5c1c0920fa3b4f5 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 1 Dec 2014 17:33:54 -0700 Subject: buildman: Try to guess the upstream commit Buildman normally obtains the upstream commit by asking git. Provided that the branch was created with 'git checkout -b ' then this normally works. When there is no upstream, we can try to guess one, by looking up through the commits until we find a branch. Add a function to try this and print a warning if buildman ends up relying on it. Also update the documentation to match. Signed-off-by: Simon Glass Suggested-by: Wolfgang Denk --- tools/buildman/README | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/buildman/README') diff --git a/tools/buildman/README b/tools/buildman/README index 0f8ea200f5..8e7a68c34f 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -310,8 +310,9 @@ branch with a valid upstream) $ ./tools/buildman/buildman -b -n If it can't detect the upstream branch, try checking out the branch, and -doing something like 'git branch --set-upstream upstream/master' -or something similar. +doing something like 'git branch --set-upstream-to upstream/master' +or something similar. Buildman will try to guess a suitable upstream branch +if it can't find one (you will see a message like" Guessing upstream as ...). As an example: -- cgit v1.2.3