{"diffoscope-json-version": 1, "source1": "/srv/reproducible-results/rbuild-debian/r-b-build.Mqhp3A2Y/b1/stgit_0.19-1_i386.changes", "source2": "/srv/reproducible-results/rbuild-debian/r-b-build.Mqhp3A2Y/b2/stgit_0.19-1_i386.changes", "unified_diff": null, "details": [{"source1": "Files", "source2": "Files", "unified_diff": "@@ -1,3 +1,3 @@\n \n  78824c5471b8ce6050577d33b551c0f5 39180 vcs optional stgit-contrib_0.19-1_all.deb\n- 1599d20a80cb103db41e9d2b06920248 106628 vcs optional stgit_0.19-1_all.deb\n+ f3858b5408f7a73320909ee73435a83e 106640 vcs optional stgit_0.19-1_all.deb\n"}, {"source1": "stgit_0.19-1_all.deb", "source2": "stgit_0.19-1_all.deb", "unified_diff": null, "details": [{"source1": "file list", "source2": "file list", "unified_diff": "@@ -1,3 +1,3 @@\n -rw-r--r--   0        0        0        4 2019-10-03 12:38:18.000000 debian-binary\n -rw-r--r--   0        0        0     3268 2019-10-03 12:38:18.000000 control.tar.xz\n--rw-r--r--   0        0        0   103168 2019-10-03 12:38:18.000000 data.tar.xz\n+-rw-r--r--   0        0        0   103180 2019-10-03 12:38:18.000000 data.tar.xz\n"}, {"source1": "control.tar.xz", "source2": "control.tar.xz", "unified_diff": null, "details": [{"source1": "control.tar", "source2": "control.tar", "unified_diff": null, "details": [{"source1": "./md5sums", "source2": "./md5sums", "unified_diff": null, "details": [{"source1": "./md5sums", "source2": "./md5sums", "comments": ["Files differ"], "unified_diff": null}]}]}]}, {"source1": "data.tar.xz", "source2": "data.tar.xz", "unified_diff": null, "details": [{"source1": "data.tar", "source2": "data.tar", "unified_diff": null, "details": [{"source1": "./usr/lib/python3/dist-packages/stgit/commands/cmdlist.py", "source2": "./usr/lib/python3/dist-packages/stgit/commands/cmdlist.py", "comments": ["Ordering differences only"], "unified_diff": "@@ -1,214 +1,214 @@\n from __future__ import unicode_literals\n \n command_list = {\n-    'delete': (\n-        'delete',\n-        'Patch commands',\n-        'Delete patches',\n-    ),\n-    'patches': (\n-        'patches',\n-        'Stack (branch) commands',\n-        'Show the applied patches modifying a file',\n-    ),\n-    'goto': (\n-        'goto',\n+    'pull': (\n+        'pull',\n         'Stack (branch) commands',\n-        'Push or pop patches to the given one',\n+        'Pull changes from a remote repository',\n     ),\n-    'import': (\n-        'imprt',\n+    'pick': (\n+        'pick',\n         'Patch commands',\n-        'Import a GNU diff file as a new patch',\n-    ),\n-    'clone': (\n-        'clone',\n-        'Repository commands',\n-        'Make a local clone of a remote repository',\n+        'Import a patch from a different branch or a commit object',\n     ),\n     'uncommit': (\n         'uncommit',\n         'Stack (branch) commands',\n         'Turn regular git commits into StGit patches',\n     ),\n-    'new': (\n-        'new',\n-        'Patch commands',\n-        'Create a new, empty patch',\n-    ),\n-    'sink': (\n-        'sink',\n-        'Stack (branch) commands',\n-        'Send patches deeper down the stack',\n-    ),\n-    'mail': (\n-        'mail',\n-        'Patch commands',\n-        'Send a patch or series of patches by e-mail',\n-    ),\n-    'export': (\n-        'export',\n+    'sync': (\n+        'sync',\n         'Patch commands',\n-        'Export patches to a directory',\n+        'Synchronise patches with a branch or a series',\n     ),\n-    'push': (\n-        'push',\n+    'pop': (\n+        'pop',\n         'Stack (branch) commands',\n-        'Push one or more patches onto the stack',\n+        'Pop one or more patches from the stack',\n     ),\n-    'hide': (\n-        'hide',\n+    'branch': (\n+        'branch',\n         'Stack (branch) commands',\n-        'Hide a patch in the series',\n+        'Branch operations: switch, list, create, rename, delete, ...',\n     ),\n-    'log': (\n-        'log',\n+    'patches': (\n+        'patches',\n         'Stack (branch) commands',\n-        'Display the patch changelog',\n+        'Show the applied patches modifying a file',\n     ),\n     'init': (\n         'init',\n         'Stack (branch) commands',\n         'Initialise the current branch for use with StGIT',\n     ),\n-    'next': (\n-        'next',\n+    'clean': (\n+        'clean',\n         'Stack (branch) commands',\n-        'Print the name of the next patch',\n+        'Delete the empty patches in the series',\n     ),\n-    'refresh': (\n-        'refresh',\n-        'Patch commands',\n-        'Generate a new commit for the current patch',\n+    'publish': (\n+        'publish',\n+        'Stack (branch) commands',\n+        'Push the stack changes to a merge-friendly branch',\n     ),\n-    'commit': (\n-        'commit',\n+    'push': (\n+        'push',\n         'Stack (branch) commands',\n-        'Permanently store the applied patches into the stack base',\n+        'Push one or more patches onto the stack',\n     ),\n-    'float': (\n-        'float',\n+    'redo': (\n+        'redo',\n         'Stack (branch) commands',\n-        'Push patches to the top, even if applied',\n+        'Undo the last undo operation',\n     ),\n-    'show': (\n-        'show',\n+    'mail': (\n+        'mail',\n         'Patch commands',\n-        'Show the commit corresponding to a patch',\n+        'Send a patch or series of patches by e-mail',\n     ),\n-    'unhide': (\n-        'unhide',\n+    'id': (\n+        'id',\n+        'Repository commands',\n+        'Print the git hash value of a StGit reference',\n+    ),\n+    'undo': (\n+        'undo',\n         'Stack (branch) commands',\n-        'Unhide a hidden patch',\n+        'Undo the last operation',\n     ),\n-    'pop': (\n-        'pop',\n+    'prev': (\n+        'prev',\n         'Stack (branch) commands',\n-        'Pop one or more patches from the stack',\n+        'Print the name of the previous patch',\n+    ),\n+    'next': (\n+        'next',\n+        'Stack (branch) commands',\n+        'Print the name of the next patch',\n+    ),\n+    'log': (\n+        'log',\n+        'Stack (branch) commands',\n+        'Display the patch changelog',\n+    ),\n+    'edit': (\n+        'edit',\n+        'Patch commands',\n+        'Edit a patch description or diff',\n     ),\n     'diff': (\n         'diff',\n         'Index/worktree commands',\n         'Show the tree diff',\n     ),\n-    'pick': (\n-        'pick',\n+    'import': (\n+        'imprt',\n         'Patch commands',\n-        'Import a patch from a different branch or a commit object',\n+        'Import a GNU diff file as a new patch',\n     ),\n-    'clean': (\n-        'clean',\n-        'Stack (branch) commands',\n-        'Delete the empty patches in the series',\n+    'export': (\n+        'export',\n+        'Patch commands',\n+        'Export patches to a directory',\n     ),\n-    'id': (\n-        'id',\n-        'Repository commands',\n-        'Print the git hash value of a StGit reference',\n+    'float': (\n+        'float',\n+        'Stack (branch) commands',\n+        'Push patches to the top, even if applied',\n     ),\n     'top': (\n         'top',\n         'Stack (branch) commands',\n         'Print the name of the top patch',\n     ),\n-    'series': (\n-        'series',\n-        'Stack (branch) commands',\n-        'Print the patch series',\n-    ),\n-    'rebase': (\n-        'rebase',\n-        'Stack (branch) commands',\n-        'Move the stack base to another point in history',\n-    ),\n-    'publish': (\n-        'publish',\n+    'sink': (\n+        'sink',\n         'Stack (branch) commands',\n-        'Push the stack changes to a merge-friendly branch',\n+        'Send patches deeper down the stack',\n     ),\n-    'redo': (\n-        'redo',\n+    'squash': (\n+        'squash',\n         'Stack (branch) commands',\n-        'Undo the last undo operation',\n+        'Squash two or more patches into one',\n     ),\n     'fold': (\n         'fold',\n         'Patch commands',\n         'Integrate a GNU diff patch into the current patch',\n     ),\n-    'rename': (\n-        'rename',\n-        'Patch commands',\n-        'Rename a patch',\n+    'repair': (\n+        'repair',\n+        'Stack (branch) commands',\n+        'Fix StGit metadata if branch was modified with git commands',\n     ),\n-    'files': (\n-        'files',\n+    'new': (\n+        'new',\n         'Patch commands',\n-        'Show the files modified by a patch (or the current patch)',\n+        'Create a new, empty patch',\n     ),\n-    'edit': (\n-        'edit',\n-        'Patch commands',\n-        'Edit a patch description or diff',\n+    'goto': (\n+        'goto',\n+        'Stack (branch) commands',\n+        'Push or pop patches to the given one',\n     ),\n-    'pull': (\n-        'pull',\n+    'commit': (\n+        'commit',\n         'Stack (branch) commands',\n-        'Pull changes from a remote repository',\n+        'Permanently store the applied patches into the stack base',\n     ),\n-    'squash': (\n-        'squash',\n+    'clone': (\n+        'clone',\n+        'Repository commands',\n+        'Make a local clone of a remote repository',\n+    ),\n+    'series': (\n+        'series',\n         'Stack (branch) commands',\n-        'Squash two or more patches into one',\n+        'Print the patch series',\n     ),\n-    'branch': (\n-        'branch',\n+    'unhide': (\n+        'unhide',\n         'Stack (branch) commands',\n-        'Branch operations: switch, list, create, rename, delete, ...',\n+        'Unhide a hidden patch',\n     ),\n-    'repair': (\n-        'repair',\n+    'show': (\n+        'show',\n+        'Patch commands',\n+        'Show the commit corresponding to a patch',\n+    ),\n+    'delete': (\n+        'delete',\n+        'Patch commands',\n+        'Delete patches',\n+    ),\n+    'refresh': (\n+        'refresh',\n+        'Patch commands',\n+        'Generate a new commit for the current patch',\n+    ),\n+    'hide': (\n+        'hide',\n         'Stack (branch) commands',\n-        'Fix StGit metadata if branch was modified with git commands',\n+        'Hide a patch in the series',\n     ),\n     'reset': (\n         'reset',\n         'Stack (branch) commands',\n         'Reset the patch stack to an earlier state',\n     ),\n-    'prev': (\n-        'prev',\n+    'rebase': (\n+        'rebase',\n         'Stack (branch) commands',\n-        'Print the name of the previous patch',\n+        'Move the stack base to another point in history',\n     ),\n-    'sync': (\n-        'sync',\n+    'files': (\n+        'files',\n         'Patch commands',\n-        'Synchronise patches with a branch or a series',\n+        'Show the files modified by a patch (or the current patch)',\n     ),\n-    'undo': (\n-        'undo',\n-        'Stack (branch) commands',\n-        'Undo the last operation',\n+    'rename': (\n+        'rename',\n+        'Patch commands',\n+        'Rename a patch',\n     ),\n }\n"}, {"source1": "./usr/share/bash-completion/completions/stg", "source2": "./usr/share/bash-completion/completions/stg", "unified_diff": "@@ -152,38 +152,38 @@\n _stg_commit ()\n {\n     local flags=\"--all --help --number\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--number) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_delete ()\n {\n     local flags=\"--branch --help --spill --top\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_diff ()\n {\n     local flags=\"--diff-opts --help --range --stat\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        -r|--range) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_dirty_files) $(_known_files) $flags\" -- \"$cur\")) ;;\n+        -r|--range) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_dirty_files) $flags $(_known_files)\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_edit ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --diff --diff-opts --edit --file --help --message --no-verify --review --save-template --set-tree --sign\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -192,54 +192,54 @@\n         -m|--message) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --save-template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --author) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authname) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authemail) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authdate) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n         -t|--set-tree) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_export ()\n {\n     local flags=\"--branch --diff-opts --dir --extension --help --numbered --patch --stdout --template\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -d|--dir) COMPREPLY=($(compgen -A directory -- \"$cur\")) ;;\n         -e|--extension) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -t|--template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_files ()\n {\n     local flags=\"--bare --diff-opts --help --stat\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_float ()\n {\n     local flags=\"--help --keep --series\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -s|--series) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_fold ()\n {\n     local flags=\"--base --help --reject --strip --threeway\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -253,36 +253,36 @@\n \n _stg_goto ()\n {\n     local flags=\"--help --keep --merged\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_other_applied_patches) $flags $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_other_applied_patches) $(_unapplied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_hide ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_id ()\n {\n     local flags=\"--help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_import ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --base --edit --help --ignore --mail --mbox --name --reject --replace --review --series --showdiff --sign --strip --stripname --url\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -313,15 +313,15 @@\n {\n     local flags=\"--branch --clear --diff --full --graphical --help --number\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -n|--number) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_mail ()\n {\n     local flags=\"--all --attach --attach-inline --auto --bcc --branch --cc --cover --diff-opts --edit-cover --edit-patches --git --help --in-reply-to --mbox --no-thread --prefix --sleep --smtp-password --smtp-server --smtp-tls --smtp-user --template --to --unrelated --version\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -336,16 +336,16 @@\n         -c|--cover) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -s|--sleep) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --in-reply-to) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --smtp-server) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -u|--smtp-user) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -p|--smtp-password) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_new ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --file --help --message --no-verify --review --save-template --sign\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -376,29 +376,29 @@\n _stg_patches ()\n {\n     local flags=\"--branch --diff --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_known_files) $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_known_files)\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_pick ()\n {\n     local flags=\"--expose --file --fold --help --name --parent --ref-branch --revert --unapplied --update\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--name) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -B|--ref-branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -p|--parent) COMPREPLY=($(compgen -W \"$(_all_branches) $(_tags) $(_remotes)\" -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_pop ()\n {\n     local flags=\"--all --help --keep --number --spill\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -500,15 +500,15 @@\n _stg_rename ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_repair ()\n {\n     local flags=\"--help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -520,76 +520,76 @@\n \n _stg_reset ()\n {\n     local flags=\"--hard --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_series ()\n {\n     local flags=\"--all --applied --author --branch --count --description --empty --help --hidden --missing --noprefix --short --showbranch --unapplied\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -m|--missing) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_show ()\n {\n     local flags=\"--applied --branch --diff-opts --help --stat --unapplied\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_sink ()\n {\n     local flags=\"--help --keep --nopush --to\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -t|--to) COMPREPLY=($(compgen -W \"$(_applied_patches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_squash ()\n {\n     local flags=\"--file --help --message --name --no-verify --save-template\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--name) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -m|--message) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --save-template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_sync ()\n {\n     local flags=\"--all --help --ref-branch --series\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -B|--ref-branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -s|--series) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_top ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -626,15 +626,15 @@\n _stg_unhide ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_hidden_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_hidden_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg ()\n {\n     local i\n     local c=1\n"}, {"source1": "./usr/share/stgit/completion/stgit-completion.bash", "source2": "./usr/share/stgit/completion/stgit-completion.bash", "unified_diff": "@@ -152,38 +152,38 @@\n _stg_commit ()\n {\n     local flags=\"--all --help --number\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--number) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_delete ()\n {\n     local flags=\"--branch --help --spill --top\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_diff ()\n {\n     local flags=\"--diff-opts --help --range --stat\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        -r|--range) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_dirty_files) $(_known_files) $flags\" -- \"$cur\")) ;;\n+        -r|--range) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_dirty_files) $flags $(_known_files)\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_edit ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --diff --diff-opts --edit --file --help --message --no-verify --review --save-template --set-tree --sign\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -192,54 +192,54 @@\n         -m|--message) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --save-template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --author) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authname) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authemail) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --authdate) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n         -t|--set-tree) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_export ()\n {\n     local flags=\"--branch --diff-opts --dir --extension --help --numbered --patch --stdout --template\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -d|--dir) COMPREPLY=($(compgen -A directory -- \"$cur\")) ;;\n         -e|--extension) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -t|--template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_files ()\n {\n     local flags=\"--bare --diff-opts --help --stat\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_float ()\n {\n     local flags=\"--help --keep --series\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -s|--series) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_fold ()\n {\n     local flags=\"--base --help --reject --strip --threeway\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -253,36 +253,36 @@\n \n _stg_goto ()\n {\n     local flags=\"--help --keep --merged\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_other_applied_patches) $flags $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_other_applied_patches) $(_unapplied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_hide ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_id ()\n {\n     local flags=\"--help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_import ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --base --edit --help --ignore --mail --mbox --name --reject --replace --review --series --showdiff --sign --strip --stripname --url\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -313,15 +313,15 @@\n {\n     local flags=\"--branch --clear --diff --full --graphical --help --number\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -n|--number) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_mail ()\n {\n     local flags=\"--all --attach --attach-inline --auto --bcc --branch --cc --cover --diff-opts --edit-cover --edit-patches --git --help --in-reply-to --mbox --no-thread --prefix --sleep --smtp-password --smtp-server --smtp-tls --smtp-user --template --to --unrelated --version\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -336,16 +336,16 @@\n         -c|--cover) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -s|--sleep) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --in-reply-to) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --smtp-server) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -u|--smtp-user) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -p|--smtp-password) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_new ()\n {\n     local flags=\"--ack --authdate --authemail --authname --author --file --help --message --no-verify --review --save-template --sign\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -376,29 +376,29 @@\n _stg_patches ()\n {\n     local flags=\"--branch --diff --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_known_files) $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_known_files)\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_pick ()\n {\n     local flags=\"--expose --file --fold --help --name --parent --ref-branch --revert --unapplied --update\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--name) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -B|--ref-branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -p|--parent) COMPREPLY=($(compgen -W \"$(_all_branches) $(_tags) $(_remotes)\" -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_pop ()\n {\n     local flags=\"--all --help --keep --number --spill\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -500,15 +500,15 @@\n _stg_rename ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_applied_patches) $flags $(_hidden_patches) $(_unapplied_patches)\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches) $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_repair ()\n {\n     local flags=\"--help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -520,76 +520,76 @@\n \n _stg_reset ()\n {\n     local flags=\"--hard --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_series ()\n {\n     local flags=\"--all --applied --author --branch --count --description --empty --help --hidden --missing --noprefix --short --showbranch --unapplied\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -m|--missing) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_show ()\n {\n     local flags=\"--applied --branch --diff-opts --help --stat --unapplied\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        -O|--diff-opts) COMPREPLY=($(compgen -W \"-C -M\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_hidden_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        -O|--diff-opts) COMPREPLY=($(compgen -W \"-M -C\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_unapplied_patches) $(_hidden_patches) $(_applied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_sink ()\n {\n     local flags=\"--help --keep --nopush --to\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -t|--to) COMPREPLY=($(compgen -W \"$(_applied_patches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_squash ()\n {\n     local flags=\"--file --help --message --name --no-verify --save-template\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -n|--name) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -m|--message) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         -f|--file) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n         --save-template) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_sync ()\n {\n     local flags=\"--all --help --ref-branch --series\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -B|--ref-branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n         -s|--series) COMPREPLY=($(compgen -A file -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_applied_patches) $(_unapplied_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_unapplied_patches) $(_applied_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg_top ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n@@ -626,15 +626,15 @@\n _stg_unhide ()\n {\n     local flags=\"--branch --help\"\n     local prev=\"${COMP_WORDS[COMP_CWORD-1]}\"\n     local cur=\"${COMP_WORDS[COMP_CWORD]}\"\n     case \"$prev\" in\n         -b|--branch) COMPREPLY=($(compgen -W \"$(_stg_branches)\" -- \"$cur\")) ;;\n-        *) COMPREPLY=($(compgen -W \"$flags $(_patch_range \"$(_hidden_patches)\" \"$cur\")\" -- \"$cur\")) ;;\n+        *) COMPREPLY=($(compgen -W \"$(_patch_range \"$(_hidden_patches)\" \"$cur\") $flags\" -- \"$cur\")) ;;\n     esac\n }\n \n _stg ()\n {\n     local i\n     local c=1\n"}]}]}]}]}