Skip to content

Commit

Permalink
chore: bump git subrepo
Browse files Browse the repository at this point in the history
  • Loading branch information
ludamad0 committed Feb 5, 2024
1 parent 970c54a commit 51ae883
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion scripts/git-subrepo/Intro.pod
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Submodules tend to receive a lot of bad press. Here's some of it:

=item * L<http://ayende.com/blog/4746/the-problem-with-git-submodules>

=item * L<http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/>
=item * L<https://web.archive.org/web/20171101202911/http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/>

=item * L<http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/>

Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/doc/intro-to-subrepo.swim
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ article is about.
Submodules tend to receive a lot of bad press. Here's some of it:

* http://ayende.com/blog/4746/the-problem-with-git-submodules
* http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/
* https://web.archive.org/web/20171101202911/http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/
* http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/

A quick recap of some of the good and bad things about submodules:
Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/ext/bashplus/bin/bash+
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2013-2020 Ingy döt Net
#------------------------------------------------------------------------------

set -eu
set -e
shopt -s compat31 &>/dev/null || true

#------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/ext/bashplus/lib/bash+.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Copyright (c) 2013-2020 Ingy döt Net

set -eu
set -e

[[ ${BASHPLUS_VERSION-} ]] && return 0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Copyright (c) 2013-2020 Ingy döt Net
#------------------------------------------------------------------------------

set -eu
set -e
shopt -s compat31 &>/dev/null || true

#------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# Copyright (c) 2013-2020 Ingy döt Net

set -eu
set -e

[[ ${BASHPLUS_VERSION-} ]] && return 0

Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/lib/git-subrepo.d/help-functions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# DO NOT EDIT. This file generated by pkg/bin/generate-help-functions.pl.

set -eu
set -e

help:all() {
cat <<'...'
Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/note/init-test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

set -ex
cat $0 # Show this script in the output
Expand Down
4 changes: 2 additions & 2 deletions scripts/git-subrepo/note/recreate-rebase-conflict.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#!/bin/bash

set -eu
set -e
set -x

# Make a directory to work in:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

set -ex

Expand All @@ -24,6 +24,6 @@ git clone repo1 repo3
git subrepo clone ../repo2 subrepo
bash
git rebase -i HEAD^
git log -p
git log -p
ls
)
2 changes: 1 addition & 1 deletion scripts/git-subrepo/note/test-subrepo-push.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

set -ex

Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/note/test.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/bash

set -x

Expand Down
2 changes: 1 addition & 1 deletion scripts/git-subrepo/pkg/bin/generate-help-functions.pl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sub write_start {
# DO NOT EDIT. This file generated by pkg/bin/generate-help-functions.pl.
set -eu
set -e
...
}

Expand Down

0 comments on commit 51ae883

Please sign in to comment.