Skip to content

Commit 6224df6

Browse files
dschodscho
committed
Upgrade all packages
Most importantly libserf, which will hopefully address git-for-windows/git#1993... Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1d46bc6 commit 6224df6

File tree

4,074 files changed

+169
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,074 files changed

+169
-144
lines changed

‎etc/pacman.d/gnupg/S.gpg-agent

53 Bytes
Binary file not shown.

‎etc/pacman.d/gnupg/S.gpg-agent.browser

53 Bytes
Binary file not shown.

‎etc/pacman.d/gnupg/S.gpg-agent.extra

53 Bytes
Binary file not shown.

‎etc/pacman.d/gnupg/S.gpg-agent.ssh

53 Bytes
Binary file not shown.

‎etc/pacman.d/gnupg/S.scdaemon

53 Bytes
Binary file not shown.

‎usr/bin/dirmngr-client.exe

0 Bytes
Binary file not shown.

‎usr/bin/dirmngr.exe

5.76 KB
Binary file not shown.

‎usr/bin/git-flow

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# http://github.com/petervanderdoes/gitflow
1111
#
1212
# Authors:
13-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
13+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1414
#
1515
# Original Author:
1616
# Copyright 2010 Vincent Driessen. All rights reserved.

‎usr/bin/git-flow-bugfix

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
# Original Author:
1717
# Copyright 2010 Vincent Driessen. All rights reserved.
@@ -199,7 +199,6 @@ F,[no]fetch Fetch from origin before performing local operation
199199

200200
require_base_is_local_branch "$base"
201201
gitflow_require_name_arg
202-
gitflow_config_set_base_branch $base $BRANCH
203202

204203
# Update the local repo with remote changes, if asked
205204
if flag fetch; then
@@ -217,6 +216,7 @@ F,[no]fetch Fetch from origin before performing local operation
217216

218217
run_pre_hook "$NAME" "$ORIGIN" "$BRANCH" "$base"
219218

219+
gitflow_config_set_base_branch $base $BRANCH
220220

221221
# create branch
222222
git_do checkout -b "$BRANCH" "$base" || die "Could not create bugfix branch '$BRANCH'."
@@ -438,6 +438,10 @@ helper_finish_cleanup() {
438438
remotebranchdeleted=$FLAGS_FALSE
439439
localbranchdeleted=$FLAGS_FALSE
440440

441+
if flag push; then
442+
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
443+
fi
444+
441445
if noflag keep; then
442446

443447
# Always delete remote first
@@ -469,10 +473,6 @@ helper_finish_cleanup() {
469473
fi
470474
fi
471475

472-
if flag push; then
473-
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
474-
fi
475-
476476
echo
477477
echo "Summary of actions:"
478478
echo "- The bugfix branch '$BRANCH' was merged into '$BASE_BRANCH'"
@@ -598,7 +598,7 @@ showcommands! Show git commands while executing them
598598
base=$(gitflow_config_get_base_branch $BRANCH)
599599
base=${base:-$DEVELOP_BRANCH}
600600

601-
git_do diff "$base..$BRANCH"
601+
git_do diff "$base...$BRANCH"
602602
}
603603

604604
cmd_checkout() {

‎usr/bin/git-flow-config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
#
1717
# Redistribution and use in source and binary forms, with or without

‎usr/bin/git-flow-feature

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
# Original Author:
1717
# Copyright 2010 Vincent Driessen. All rights reserved.
@@ -199,7 +199,6 @@ F,[no]fetch Fetch from origin before performing local operation
199199

200200
require_base_is_local_branch "$base"
201201
gitflow_require_name_arg
202-
gitflow_config_set_base_branch $base $BRANCH
203202

204203
# Update the local repo with remote changes, if asked
205204
if flag fetch; then
@@ -217,6 +216,7 @@ F,[no]fetch Fetch from origin before performing local operation
217216

218217
run_pre_hook "$NAME" "$ORIGIN" "$BRANCH" "$base"
219218

219+
gitflow_config_set_base_branch $base $BRANCH
220220

221221
# create branch
222222
git_do checkout -b "$BRANCH" "$base" || die "Could not create feature branch '$BRANCH'."
@@ -438,6 +438,10 @@ helper_finish_cleanup() {
438438
remotebranchdeleted=$FLAGS_FALSE
439439
localbranchdeleted=$FLAGS_FALSE
440440

441+
if flag push; then
442+
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
443+
fi
444+
441445
if noflag keep; then
442446

443447
# Always delete remote first
@@ -469,10 +473,6 @@ helper_finish_cleanup() {
469473
fi
470474
fi
471475

472-
if flag push; then
473-
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
474-
fi
475-
476476
echo
477477
echo "Summary of actions:"
478478
echo "- The feature branch '$BRANCH' was merged into '$BASE_BRANCH'"
@@ -598,7 +598,7 @@ showcommands! Show git commands while executing them
598598
base=$(gitflow_config_get_base_branch $BRANCH)
599599
base=${base:-$DEVELOP_BRANCH}
600600

601-
git_do diff "$base..$BRANCH"
601+
git_do diff "$base...$BRANCH"
602602
}
603603

604604
cmd_checkout() {

‎usr/bin/git-flow-hotfix

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
# Original Author:
1717
# Copyright 2010 Vincent Driessen. All rights reserved.
@@ -189,7 +189,6 @@ F,[no]fetch Fetch from origin before performing local operation
189189
# No need to continue if not clean
190190
require_base_is_local_branch "$base"
191191
git_config_bool_exists "gitflow.allowdirty" || require_clean_working_tree
192-
gitflow_config_set_base_branch $base $BRANCH
193192

194193
# Update the local repo with remote changes, if asked
195194
if flag fetch; then
@@ -219,6 +218,8 @@ F,[no]fetch Fetch from origin before performing local operation
219218

220219
run_pre_hook "$VERSION_PREFIX$VERSION" "$ORIGIN" "$BRANCH" "$base"
221220

221+
gitflow_config_set_base_branch $base $BRANCH
222+
222223
# Create branch
223224
git_do checkout -b "$BRANCH" "$base" || die "Could not create hotfix branch '$BRANCH'."
224225

@@ -581,6 +582,16 @@ T,tagname! Use given tag name
581582

582583
run_post_hook "$VERSION_PREFIX$TAGNAME" "$ORIGIN" "$BRANCH"
583584

585+
if flag push; then
586+
if [ "$BASE_BRANCH" = "$MASTER_BRANCH" ]; then
587+
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
588+
fi
589+
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
590+
if noflag notag; then
591+
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
592+
fi
593+
fi
594+
584595
# Delete branch
585596
if noflag keep; then
586597

@@ -610,16 +621,6 @@ T,tagname! Use given tag name
610621

611622
fi
612623

613-
if flag push; then
614-
if [ "$BASE_BRANCH" = "$MASTER_BRANCH" ]; then
615-
git_do push "$ORIGIN" "$DEVELOP_BRANCH" || die "Could not push branch '$DEVELOP_BRANCH' to remote '$ORIGIN'."
616-
fi
617-
git_do push "$ORIGIN" "$BASE_BRANCH" || die "Could not push branch '$BASE_BRANCH' to remote '$ORIGIN'."
618-
if noflag notag; then
619-
git_do push --tags "$ORIGIN" || die "Could not push tags to remote '$ORIGIN'."
620-
fi
621-
fi
622-
623624
echo
624625
echo "Summary of actions:"
625626
if flag fetch; then

‎usr/bin/git-flow-init

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
# Original Author:
1717
# Copyright 2010 Vincent Driessen. All rights reserved.
@@ -67,6 +67,13 @@ showcommands! Show git commands while executing them
6767
d,[no]defaults Use default branch naming conventions
6868
f,[no]force Force setting of gitflow branches, even if already configured
6969
70+
p,feature! Feature branches
71+
b,bugfix! Bugfix branches
72+
r,release! Release branches
73+
x,hotfix! Hotfix branches
74+
s,support! Support branches
75+
t,tag! Version tag prefix
76+
7077
Use config file location
7178
local! use repository config file
7279
global! use global config file
@@ -83,6 +90,12 @@ file= use given config file
8390
DEFINE_boolean 'global' false 'use global config file'
8491
DEFINE_boolean 'system' false 'use system config file'
8592
DEFINE_string 'file' "" 'use given config file'
93+
DEFINE_string 'feature' "" 'feature branches' p
94+
DEFINE_string 'bugfix' "" 'bugfix branches' b
95+
DEFINE_string 'release' "" 'release branches' r
96+
DEFINE_string 'hotfix' "" 'hotfix branches' x
97+
DEFINE_string 'support' "" 'support branches' s
98+
DEFINE_string 'tag' "" 'version tag prefix' t
8699

87100
# Override defaults with values from config
88101
gitflow_override_flag_boolean "init.defaults" "defaults"
@@ -293,7 +306,7 @@ file= use given config file
293306

294307
# Feature branches
295308
if ! git config --get gitflow.prefix.feature >/dev/null 2>&1 || flag force; then
296-
default_suggestion=$(git config --get gitflow.prefix.feature || echo feature/)
309+
default_suggestion=$(echo $FLAGS_feature || git config --get gitflow.prefix.feature || echo feature/)
297310
printf "Feature branches? [$default_suggestion] "
298311
if noflag defaults; then
299312
read answer
@@ -306,7 +319,7 @@ file= use given config file
306319

307320
# Bugfix branches
308321
if ! git config --get gitflow.prefix.bugfix >/dev/null 2>&1 || flag force; then
309-
default_suggestion=$(git config --get gitflow.prefix.bugfix || echo bugfix/)
322+
default_suggestion=$(echo $FLAGS_bugfix || git config --get gitflow.prefix.bugfix || echo bugfix/)
310323
printf "Bugfix branches? [$default_suggestion] "
311324
if noflag defaults; then
312325
read answer
@@ -319,7 +332,7 @@ file= use given config file
319332

320333
# Release branches
321334
if ! git config --get gitflow.prefix.release >/dev/null 2>&1 || flag force; then
322-
default_suggestion=$(git config --get gitflow.prefix.release || echo release/)
335+
default_suggestion=$(echo $FLAGS_release || git config --get gitflow.prefix.release || echo release/)
323336
printf "Release branches? [$default_suggestion] "
324337
if noflag defaults; then
325338
read answer
@@ -332,7 +345,7 @@ file= use given config file
332345

333346
# Hotfix branches
334347
if ! git config --get gitflow.prefix.hotfix >/dev/null 2>&1 || flag force; then
335-
default_suggestion=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
348+
default_suggestion=$(echo $FLAGS_hotfix || git config --get gitflow.prefix.hotfix || echo hotfix/)
336349
printf "Hotfix branches? [$default_suggestion] "
337350
if noflag defaults; then
338351
read answer
@@ -345,7 +358,7 @@ file= use given config file
345358

346359
# Support branches
347360
if ! git config --get gitflow.prefix.support >/dev/null 2>&1 || flag force; then
348-
default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
361+
default_suggestion=$(echo $FLAGS_support || git config --get gitflow.prefix.support || echo support/)
349362
printf "Support branches? [$default_suggestion] "
350363
if noflag defaults; then
351364
read answer
@@ -355,10 +368,10 @@ file= use given config file
355368
[ "$answer" = "-" ] && prefix= || prefix=${answer:-$default_suggestion}
356369
git_do config $gitflow_config_option gitflow.prefix.support "$prefix"
357370
fi
358-
371+
359372
# Version tag prefix
360373
if ! git config --get gitflow.prefix.versiontag >/dev/null 2>&1 || flag force; then
361-
default_suggestion=$(git config --get gitflow.prefix.versiontag || echo "")
374+
default_suggestion=$(echo $FLAGS_tag || git config --get gitflow.prefix.versiontag || echo "")
362375
printf "Version tag prefix? [$default_suggestion] "
363376
if noflag defaults; then
364377
read answer
@@ -373,7 +386,7 @@ file= use given config file
373386
if ! git config --get gitflow.path.hooks >/dev/null 2>&1 || flag force; then
374387
DOT_GIT_DIR=$(git rev-parse --git-dir)
375388
DOT_GIT_DIR=$(cd "$DOT_GIT_DIR" >/dev/null 2>&1 && pwd)
376-
default_suggestion=$(git config --get gitflow.path.hooks || echo "$DOT_GIT_DIR"/hooks)
389+
default_suggestion=$(git config --get gitflow.path.hooks || git config --get core.hooksPath || echo "$DOT_GIT_DIR"/hooks)
377390
printf "Hooks and filters directory? [$default_suggestion] "
378391
if noflag defaults; then
379392
read answer

‎usr/bin/git-flow-log

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# http://github.com/petervanderdoes/gitflow
1212
#
1313
# Authors:
14-
# Copyright 2012-2017 Peter van der Does. All rights reserved.
14+
# Copyright 2012-2019 Peter van der Does. All rights reserved.
1515
#
1616
# Original Author:
1717
# Copyright 2010 Vincent Driessen. All rights reserved.

0 commit comments

Comments
 (0)