projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Propagate errors from fetch-pack correctly to git-fetch.
[git.git]
/
git-merge-fredrik.py
diff --git
a/git-merge-fredrik.py
b/git-merge-fredrik.py
index
e4c6fe3
..
27b8486
100755
(executable)
--- a/
git-merge-fredrik.py
+++ b/
git-merge-fredrik.py
@@
-392,6
+392,9
@@
def usage():
# This strategy module figures out merge bases itself, so we only
# get heads.
+if len(sys.argv) < 4:
+ usage()
+
for nextArg in xrange(1, len(sys.argv)):
if sys.argv[nextArg] == '--':
if len(sys.argv) != nextArg + 3: