chiark
/
gitweb
/
~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Do not raise an exception if no FETCH_HEAD
[stgit]
/
stgit
/
git.py
diff --git
a/stgit/git.py
b/stgit/git.py
index cc6acb14a64003c896d45a75bb7199960783f433..78aae05ea57f4b3de71ed9929af5a6aedd0fcf33 100644
(file)
--- a/
stgit/git.py
+++ b/
stgit/git.py
@@
-1022,7
+1022,7
@@
def fetch_head():
stream.close()
if not fetch_head:
- raise GitException, 'No for-merge remote head found in FETCH_HEAD'
+ out.warn('No for-merge remote head found in FETCH_HEAD')
# here we are sure to have a single fetch_head
return fetch_head