Code

[pull] master from ingydotnet:master#3

Code

Open

pull[bot] wants to merge 115 commits intoVikash-Kothary:masterVikash-Kothary/git-subrepo:masterfrom ingydotnet:masteringydotnet/git-subrepo:masterCopy head branch name to clipboard

+2,458-1,310

Commits

Commits on Dec 4, 2019

• Travis CI not checking out a branch.

  Show description for b6fa936
  

  mupdt

  authored and

  admorgan

  committed
  b6fa936

  Copy full SHA for b6fa936

• Fixed typo

  

  matteodg

  authored and

  admorgan

  committed
  b1b93d7

  Copy full SHA for b1b93d7

• Fix typos

  Show description for 99e46df
  

  chetan51

  authored and

  admorgan

  committed
  99e46df

  Copy full SHA for 99e46df

Commits on Jan 9, 2020

• Simplify finding subrepos

  Show description for d34e6ea
  

  jamezpolley

  authored and

  ingydotnet

  committed
  d34e6ea

  Copy full SHA for d34e6ea

• Make subrepo work when run in a worktree

  Show description for 9fdd710
  

  erijo

  authored and

  ingydotnet

  committed
  9fdd710

  Copy full SHA for 9fdd710

• Fix #410 Push empty repositories with recent git versions

  Show description for a1804b6
  

  admorgan

  authored and

  ingydotnet

  committed
  a1804b6

  Copy full SHA for a1804b6

• Make “git subrepo clean -f ...” delete refs correctly

  Show description for a0c967d
  

  jrosdahl

  authored and

  ingydotnet

  committed
  a0c967d

  Copy full SHA for a0c967d

• Use topo-order in subrepo branch

  Show description for c9895df
  

  admorgan

  authored and

  ingydotnet

  committed
  c9895df

  Copy full SHA for c9895df

• Correct error message in branch

  Show description for 211f61e
  

  admorgan

  authored and

  ingydotnet

  committed
  211f61e

  Copy full SHA for 211f61e

• Update version requirement documentation

  Show description for d834b73
  

  admorgan

  authored and

  ingydotnet

  committed
  d834b73

  Copy full SHA for d834b73

• Doc: fix sentence repetition

  

  jersou

  authored and

  ingydotnet

  committed
  3c29c54

  Copy full SHA for 3c29c54

• Ask git to find the .gitrepo files

  Show description for 61efde0
  

  jamezpolley

  authored and

  ingydotnet

  committed
  61efde0

  Copy full SHA for 61efde0

• Remove conflicting -C from install -d commands.

  Show description for cafe658
  

  MarkCallow

  authored and

  ingydotnet

  committed
  cafe658

  Copy full SHA for cafe658

• Add testing on MacOS

  Show description for 47eebd7
  

  admorgan

  authored and

  ingydotnet

  committed
  47eebd7

  Copy full SHA for 47eebd7

• Don't use XXX in perl stuff

  ingydotnet

  committed
  59c1cc9

  Copy full SHA for 59c1cc9

• Force make update to always update docs

  ingydotnet

  committed
  b749f52

  Copy full SHA for b749f52

• Update the docs

  ingydotnet

  committed
  89baa75

  Copy full SHA for 89baa75

• Wrap a long line

  ingydotnet

  committed
  0f76a89

  Copy full SHA for 0f76a89

• Nicer YAML formatting in .travis.yml

  ingydotnet

  committed
  8346a8a

  Copy full SHA for 8346a8a

• Fix Bash version error messages and add to .rc

  ingydotnet

  committed
  27f51ea

  Copy full SHA for 27f51ea

• Update copyright year and repo url

  ingydotnet

  committed
  cb590c0

  Copy full SHA for cb590c0

• Release 0.4.1

  Show description for a04d8c2
  admorgan

  committed
  a04d8c2

  Copy full SHA for a04d8c2

Commits on Nov 17, 2020

• Avoid git filter-branch delay

  Show description for 68d1810
  

  mvz

  authored and

  admorgan

  committed
  68d1810

  Copy full SHA for 68d1810

• Fix error when sourcing .rc with old zsh version

  Show description for 7766c8e
  

  jrosdahl

  authored and

  admorgan

  committed
  7766c8e

  Copy full SHA for 7766c8e

• Add a fish shell startup script

  Show description for e0871b2
  

  nuxeh

  authored and

  admorgan

  committed
  e0871b2

  Copy full SHA for e0871b2

• Add manpage path to MANPATH for fish shell

  Show description for 6ae32d0
  

  nuxeh

  authored and

  admorgan

  committed
  6ae32d0

  Copy full SHA for 6ae32d0

• Fix fish.rc file to work on mac os

  Show description for a00bacd
  

  olfway

  authored and

  admorgan

  committed
  a00bacd

  Copy full SHA for a00bacd

• Don't suppress stderr when git merge fails

  

  Jon

  authored and

  admorgan

  committed
  ae643a6

  Copy full SHA for ae643a6

• Fix unreliable branch existence check

  

  Jon

  authored and

  admorgan

  committed
  7daca37

  Copy full SHA for 7daca37

• Use correct environment variable to stop filter-branch delay

  

  mvz

  authored and

  admorgan

  committed
  b0f50f0

  Copy full SHA for b0f50f0

• Use --date=default in all git log commands (Fixes #383)

  

  Chris Cosby

  authored and

  admorgan

  committed
  a0dc930

  Copy full SHA for a0dc930

• Allow test to run without a git checkout

  Show description for 7cfc4d0
  

  Austin Morgan

  authored and

  admorgan

  committed
  7cfc4d0

  Copy full SHA for 7cfc4d0

• zsh completion: Remove check for GIT_SUBREPO_ROOT

  Show description for 7635496
  

  perlpunk

  authored and

  admorgan

  committed
  7635496

  Copy full SHA for 7635496

• Fix documentation regarding merge/rebase

  Show description for f887ac8
  

  perlpunk

  authored and

  admorgan

  committed
  f887ac8

  Copy full SHA for f887ac8

• Fix get-upstream-head-branch

  Show description for b4ae4ae
  

  perlpunk

  authored and

  admorgan

  committed
  b4ae4ae

  Copy full SHA for b4ae4ae

• git subrepo pull ext/bashplus

  Show description for b6001a1
  admorgan

  committed
  b6001a1

  Copy full SHA for b6001a1

• git subrepo pull ext/test-more-bash

  Show description for 2f5f0d3
  admorgan

  committed
  2f5f0d3

  Copy full SHA for 2f5f0d3

• Support spaces in subrepo path

  Show description for ac6d333
  admorgan

  committed
  ac6d333

  Copy full SHA for ac6d333

• Make test directory modifcation easier

  Show description for 983c864
  admorgan

  committed
  983c864

  Copy full SHA for 983c864

• Add support for --force in pull

  Show description for 94e3016
  admorgan

  committed
  94e3016

  Copy full SHA for 94e3016

• Add a .gitignore file and ignore /test/tmp/

  Show description for 849ecca
  

  ingydotnet

  authored and

  admorgan

  committed
  849ecca

  Copy full SHA for 849ecca

• Add a shellcheck.t test to lint all shell files

  Show description for ea91765
  

  ingydotnet

  authored and

  admorgan

  committed
  ea91765

  Copy full SHA for ea91765

• Remove useless double quotes for assignments

  Show description for ecd0562
  

  ingydotnet

  authored and

  admorgan

  committed
  ecd0562

  Copy full SHA for ecd0562

• Remove -n from conditional tests

  Show description for 547b737
  

  ingydotnet

  authored and

  admorgan

  committed
  547b737

  Copy full SHA for 547b737

• Remove most " from inside [[ ... ]]

  Show description for de905c3
  

  ingydotnet

  authored and

  admorgan

  committed
  de905c3

  Copy full SHA for de905c3

• Change '! ... ==' to '!='

  

  ingydotnet

  authored and

  admorgan

  committed
  b2df637

  Copy full SHA for b2df637

• Skip broken test for now

  

  ingydotnet

  authored and

  admorgan

  committed
  895d2dd

  Copy full SHA for 895d2dd

• Replace backtick expressions with $(...)

  

  ingydotnet

  authored and

  admorgan

  committed
  9ae82ca

  Copy full SHA for 9ae82ca

• Double-quote variables used in command arguments

  

  ingydotnet

  authored and

  admorgan

  committed
  b1cf000

  Copy full SHA for b1cf000

• More shellcheck fixes regarding quoting

  

  ingydotnet

  authored and

  admorgan

  committed
  e5250fe

  Copy full SHA for e5250fe

• Remove fake shebangs used as hints to shellcheck

  

  ingydotnet

  authored and

  admorgan

  committed
  684cec8

  Copy full SHA for 684cec8

• Various minor adjustments suggested by shellcheck

  

  ingydotnet

  authored and

  admorgan

  committed
  582bc42

  Copy full SHA for 582bc42

• Deal with "unused" variables reported by shellcheck

  

  ingydotnet

  authored and

  admorgan

  committed
  9334199

  Copy full SHA for 9334199

• Refactor printf according to shellcheck

  

  ingydotnet

  authored and

  admorgan

  committed
  30a66cc

  Copy full SHA for 30a66cc

• Fix minor bugs flagged by shellcheck

  

  ingydotnet

  authored and

  admorgan

  committed
  90c1b32

  Copy full SHA for 90c1b32

• Return from subprocess if cd fails (per shellcheck)

  

  ingydotnet

  authored and

  admorgan

  committed
  92ec194

  Copy full SHA for 92ec194

• Don't use local for assigning process output

  

  ingydotnet

  authored and

  admorgan

  committed
  fb39023

  Copy full SHA for fb39023

• Require shellcheck 0.7.1 for test/shellcheck.t

  

  ingydotnet

  authored and

  admorgan

  committed
  4aef65e

  Copy full SHA for 4aef65e

• Fix tests on Mac

  

  ingydotnet

  authored and

  admorgan

  committed
  95149a1

  Copy full SHA for 95149a1

• Fix a travis Mac problem

  

  ingydotnet

  authored and

  admorgan

  committed
  9d65cdd

  Copy full SHA for 9d65cdd

• Add a Docker testing system for all bash versions

  

  ingydotnet

  authored and

  admorgan

  committed
  e3be73c

  Copy full SHA for e3be73c

• Use set -u and set -o pipefail

  

  ingydotnet

  authored and

  admorgan

  committed
  20e8843

  Copy full SHA for 20e8843

• Allow Bash 4.0

  

  ingydotnet

  authored and

  admorgan

  committed
  cf134da

  Copy full SHA for cf134da

• git subrepo pull ext/bashplus

  Show description for f8d67ea
  

  ingydotnet

  authored and

  admorgan

  committed
  f8d67ea

  Copy full SHA for f8d67ea

• git subrepo pull ext/test-more-bash

  Show description for 70328a8
  

  ingydotnet

  authored and

  admorgan

  committed
  70328a8

  Copy full SHA for 70328a8

• Pull didn't fail on history disconnect

  Show description for 6f871f0
  admorgan

  committed
  6f871f0

  Copy full SHA for 6f871f0

• git subrepo pull ext/bashplus

  Show description for 5230dda
  

  ingydotnet

  authored and

  admorgan

  committed
  5230dda

  Copy full SHA for 5230dda

• Make make docker-test work with various git versions

  

  ingydotnet

  authored and

  admorgan

  committed
  0f9ddd8

  Copy full SHA for 0f9ddd8

• Support GitHub actions testing...

  Show description for f4aac8c
  

  ingydotnet

  authored and

  admorgan

  committed
  f4aac8c

  Copy full SHA for f4aac8c

• Release 0.4.2

  Show description for fc061b2
  admorgan

  committed
  fc061b2

  Copy full SHA for fc061b2

• Add Austin Morgan to authors list

  

  ingydotnet

  authored and

  admorgan

  committed
  65fde50

  Copy full SHA for 65fde50

Commits on Nov 21, 2020

• The fpath variable is an array; expand correctly

  Show description for 9913b95
  

  ne-sachirou

  authored and

  ingydotnet

  committed
  9913b95

  Copy full SHA for 9913b95

• Release 0.4.3

  ingydotnet

  committed
  b562f93

  Copy full SHA for b562f93

Commits on Nov 26, 2020

• Better format for options

  Show description for 2f68596
  

  ingydotnet

  authored and

  admorgan

  committed
  2f68596

  Copy full SHA for 2f68596

Commits on Feb 8, 2021

• Fix .rc and enable-completion.sh for zsh before 5.1

  

  ingydotnet

  authored and

  admorgan

  committed
  94ac575

  Copy full SHA for 94ac575

Commits on Feb 21, 2021

• pass --force to git add so a user's global .gitignore does not affect tests

  

  falken42

  authored and

  admorgan

  committed
  87ee373

  Copy full SHA for 87ee373

Commits on Apr 15, 2021

• fix tests to support use of a default branch git config that is not "master"

  

  falken42

  authored and

  admorgan

  committed
  4d3dbea

  Copy full SHA for 4d3dbea

Commits on Jun 29, 2021

• Fix documentation links

  Show description for df97516
  admorgan

  committed
  df97516

  Copy full SHA for df97516

Commits on Jun 30, 2021

• Don't allow -b and --all

  Show description for be9f02a
  admorgan

  committed
  be9f02a

  Copy full SHA for be9f02a

Commits on Nov 23, 2021

• Fix git subrepo status command for subrepos that share a common prefix. Closes #534.

  

  cciocov

  authored and

  admorgan

  committed
  b4ae8f1

  Copy full SHA for b4ae8f1

Commits on Aug 10, 2022

• Add --file option

  Show description for 1b06cbf
  admorgan

  committed
  1b06cbf

  Copy full SHA for 1b06cbf

Commits on Sep 23, 2022

• Release 0.4.5

  Show description for aa416e4
  admorgan

  committed
  aa416e4

  Copy full SHA for aa416e4

Commits on Oct 21, 2022

• Do not depend on main repo for status tests

  

  mvz

  authored and

  admorgan

  committed
  84854b2

  Copy full SHA for 84854b2

• Remove branch creation from GitHub Action

  

  mvz

  authored and

  admorgan

  committed
  dbb99be

  Copy full SHA for dbb99be

Commits on Apr 21, 2023

• Remove worktree in push

  Show description for c14bf41
  

  DanielBauten

  authored and

  admorgan

  committed
  c14bf41

  Copy full SHA for c14bf41

• Remove unneeded worktree on push

  Show description for 89f5660
  

  DanielBauten

  authored and

  admorgan

  committed
  89f5660

  Copy full SHA for 89f5660

• Add test for empty push

  Show description for 3994d70
  

  bindreams

  authored and

  admorgan

  committed
  3994d70

  Copy full SHA for 3994d70

• Release 0.4.6

  Show description for 110b9eb
  admorgan

  committed
  110b9eb

  Copy full SHA for 110b9eb

Commits on Jan 31, 2024

• docs: Replace 404'ed hyperlink with archive.org equivalent

  

  hyperupcall

  authored and

  admorgan

  committed
  73a0129

  Copy full SHA for 73a0129

Commits on Jul 7, 2024

• Update status in the ReadMe

  Show description for b7bcec5
  admorgan

  committed
  b7bcec5

  Copy full SHA for b7bcec5

• Fix quoting

  Show description for 88393fe
  admorgan

  committed
  88393fe

  Copy full SHA for 88393fe

• Fix error tests on git 2.30 and higher

  Show description for 58ecf02
  admorgan

  committed
  58ecf02

  Copy full SHA for 58ecf02

• Address git 2.33 and later pull strategy

  Show description for 09944c2
  admorgan

  committed
  09944c2

  Copy full SHA for 09944c2

• Update git versions

  Show description for a857b16
  admorgan

  committed
  a857b16

  Copy full SHA for a857b16

• Use docker tests instead of running on base image

  Show description for 1041053
  admorgan

  committed
  1041053

  Copy full SHA for 1041053

• Release 0.4.7

  Show description for feac147
  admorgan

  committed
  feac147

  Copy full SHA for feac147

• Bugfix: Missing refs not removed properly when using clean with --force

  

  Totalus

  authored and

  admorgan

  committed
  5a6c3c2

  Copy full SHA for 5a6c3c2

Commits on Jul 8, 2024

• Update error function to allow multiple arguments

  Show description for 70b31ab
  

  jrandall

  authored and

  admorgan

  committed
  70b31ab

  Copy full SHA for 70b31ab

Commits on Jul 9, 2024

• Fix quoting in the error function

  Show description for c9ec2a6
  admorgan

  committed
  c9ec2a6

  Copy full SHA for c9ec2a6

Commits on Jul 22, 2024

• Make reclone with implicit branch update branch in .gitrepo correctly

  Show description for b03bf53
  

  jrosdahl

  authored and

  admorgan

  committed
  b03bf53

  Copy full SHA for b03bf53

• Show clearer error message when subrepo_parent is not an ancestor of HEAD

  Show description for cc0e29f
  

  OskiKervinen-MF

  authored and

  admorgan

  committed
  cc0e29f

  Copy full SHA for cc0e29f

• Add context for missing parent error message

  Show description for e7411ba
  admorgan

  committed
  e7411ba

  Copy full SHA for e7411ba

• Use configured default branch for subrepo init

  Show description for 555ade4
  admorgan

  committed
  555ade4

  Copy full SHA for 555ade4

• Add test for missing parent error

  admorgan

  committed
  6a00f6a

  Copy full SHA for 6a00f6a

• Add --force to the fetch command

  admorgan

  committed
  477915a

  Copy full SHA for 477915a

• Removed hashbangs from sourced-only files

  Show description for eb9f874
  

  spog

  authored and

  admorgan

  committed
  eb9f874

  Copy full SHA for eb9f874

• Removed executable permission on sourced-only files

  Show description for 5453dff
  

  spog

  authored and

  admorgan

  committed
  5453dff

  Copy full SHA for 5453dff

• Fixed bash-completion integration with git

  Show description for 7816a57
  

  spog

  authored and

  admorgan

  committed
  7816a57

  Copy full SHA for 7816a57

• Release 0.4.8

  Show description for 3a53c20
  admorgan

  committed
  3a53c20

  Copy full SHA for 3a53c20

Commits on Jul 25, 2024

• Revert "Fixed bash-completion integration with git"

  Show description for 8eacfe4
  admorgan

  committed
  8eacfe4

  Copy full SHA for 8eacfe4

• Release 0.4.9

  Show description for ea10886
  admorgan

  committed
  ea10886

  Copy full SHA for ea10886

Commits on Sep 9, 2024

• Fix subrepo init failing if defaultbranch not set

  Show description for 55a050a
  admorgan

  committed
  55a050a

  Copy full SHA for 55a050a

• Support older versions of git for subrep init

  Show description for 57de7d6
  admorgan

  committed
  57de7d6

  Copy full SHA for 57de7d6

Commits on Oct 8, 2024

• Include message file in error resolution

  Show description for b00d41b
  admorgan

  committed
  b00d41b

  Copy full SHA for b00d41b

Commits on Oct 16, 2024

• Update copyright year

  

  dkt01

  authored and

  admorgan

  committed
  cce3d93

  Copy full SHA for cce3d93