[PATCH] Fix missing argument handling in psql getopt
1 patchset tracked - current t41125_7
v7t41125_7posted Aug 25, 2019successwon't retryancient 7ypg 13
base3f3542621 Jul 06, 2019 - 2632 days / 18027 commits behind master (from history)
applyapplied Aug 18, 16:28
rebaselast tried Aug 18, 16:28 on 195e8e427
Applying: Fix handling of ? option Using index info to reconstruct a base tree... M src/bin/psql/startup.c Falling back to patching base and 3-way merge... Auto-merging src/bin/psql/startup.c CONFLICT (content): Merge conflict in src/bin/psql/startup.c Patch failed at 0001 Fix handling of ? option error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/bin/psql/startup.c
pushAug 18, 16:28 -> f0db2f41fbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 13 | 538 / 538 | 1m 53s / 2m 56s | docker run ... :t41125 | Aug 18, 16:35 |
run 32160483477executed 538 - ccache 140 hit / 3997 miss - head f0db2f41f - digest sha256:5d0c0bb224f93c... - run 32160483477 | ||||||