diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-12-03 10:30:48 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-12-03 10:30:48 +0100 |
| commit | 9907d7cb0870b1fcc34311a5e3ef92eaffaec265 (patch) | |
| tree | 9b555e5aa12139b156d05d95b628bc74c2da798d | |
| parent | 005922085f0135c35baa4b0e8db6f05d78586377 (diff) | |
| download | quilt-9907d7cb0870b1fcc34311a5e3ef92eaffaec265.tar.gz | |
push: Always let the user force pushing a patch
Let the user force pushing a patch even if patch returns with error
code 2. The user should know better. This happens when pushing a
patch with a header but no actual contents, for example.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/push.in | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/quilt.changes b/quilt.changes index 5615d27..cb5f351 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Dec 3 10:29:57 CET 2012 - jdelvare@suse.de + +- push: Always let the user force pushing a patch. + +------------------------------------------------------------------- Mon Dec 3 10:27:46 CET 2012 - jdelvare@suse.de - pop: Fix timestamp comparison. diff --git a/quilt/push.in b/quilt/push.in index db84a47..eeb901c 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -190,8 +190,7 @@ add_patch() [ -n "$tmp" ] && rm -f $tmp - if [ $status -eq 0 -o \ - \( $status -eq 1 -a -n "$opt_force" \) ] + if [ $status -eq 0 -o -n "$opt_force" ] then add_to_db $patch if [ $status -eq 0 ] |