Compare commits
3 Commits
e567957ea0
...
a7f7452b2b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7f7452b2b | ||
|
|
bc67399ebc | ||
|
|
02b037d0fc |
@@ -186,6 +186,7 @@ change the default without having to pass flags every time.
|
|||||||
| `GIT_MAIN_BRANCH` | `main` | Fallback main branch name used when remote HEAD cannot be detected |
|
| `GIT_MAIN_BRANCH` | `main` | Fallback main branch name used when remote HEAD cannot be detected |
|
||||||
| `GIT_DEFAULT_REMOTE` | `origin` | Default remote used by git helper functions |
|
| `GIT_DEFAULT_REMOTE` | `origin` | Default remote used by git helper functions |
|
||||||
| `GIT_WIP_PREFIX` | `wip` | Prefix used by `gwip` when generating automatic checkpoint messages |
|
| `GIT_WIP_PREFIX` | `wip` | Prefix used by `gwip` when generating automatic checkpoint messages |
|
||||||
|
| `GIT_GACP_AUTO_ADD` | `1` | Set to `1` to make `gacp` automatically add all modified files when no explicit file list is given; set to `0` to require explicit paths or the `-a` flag |
|
||||||
|
|
||||||
**`[info]`**
|
**`[info]`**
|
||||||
|
|
||||||
|
|||||||
179
doc/CHANGELOG.md
179
doc/CHANGELOG.md
@@ -7,6 +7,29 @@ Versions follow `MAJOR.MINOR.PATCH-REVISION_STAGE_N` (e.g. `3.99.1-4_rc_1`).
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## [4.0.0] — 2026-04-23
|
||||||
|
|
||||||
|
### Added
|
||||||
|
- New `profile.conf` reference template at `doc/profile.conf.example`.
|
||||||
|
- Dynamic locale shortcuts generated from `SET_LOCALE` and startup default
|
||||||
|
language selection through `DEFAULT_LANG`.
|
||||||
|
- Prompt theming system with bundled themes (`default`, `dark`, `light`,
|
||||||
|
`solarized`, `solarized-light`, `monokai`, `monochrome`, `abyss`, `plasma`,
|
||||||
|
`adwaita`) and per-key prompt color overrides.
|
||||||
|
- Module defaults exposed as configuration keys in `profile.conf`.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
- `utaz` now supports a wider range of archive formats.
|
||||||
|
- Prompt and theme rendering improved, including better 24-bit color support.
|
||||||
|
- Overall code quality and maintainability improved across modules.
|
||||||
|
|
||||||
|
### Documentation
|
||||||
|
- README updated with full function reference and configuration tables.
|
||||||
|
- New and expanded docs in `doc/` (`CONTRIBUTING.md`, `FAQ.md`, `todo.md`).
|
||||||
|
- Historical releases imported from `history.txt` into this changelog.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## [3.99.2-4_rc_2] — 2026-04-21
|
## [3.99.2-4_rc_2] — 2026-04-21
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
@@ -78,12 +101,6 @@ Versions follow `MAJOR.MINOR.PATCH-REVISION_STAGE_N` (e.g. `3.99.1-4_rc_1`).
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
> **Note:** Versions prior to `3.95.x-4_beta` did not maintain a formal
|
|
||||||
> changelog. The full history of earlier changes is available through the git
|
|
||||||
> log (`git log --oneline`).
|
|
||||||
|
|
||||||
## [3.95.3-4_beta_3] — 2024
|
## [3.95.3-4_beta_3] — 2024
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
@@ -95,3 +112,153 @@ Versions follow `MAJOR.MINOR.PATCH-REVISION_STAGE_N` (e.g. `3.99.1-4_rc_1`).
|
|||||||
- `genpwd` / `pwdscore` password tools.
|
- `genpwd` / `pwdscore` password tools.
|
||||||
- `matrix` / `rain` screensavers.
|
- `matrix` / `rain` screensavers.
|
||||||
- `profile_upgrade` with git and archive download support.
|
- `profile_upgrade` with git and archive download support.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
> **Note:** The section below was imported from `history.txt` to preserve
|
||||||
|
> pre-`3.95.x-4_beta` release notes.
|
||||||
|
|
||||||
|
## Legacy releases (imported from `history.txt`)
|
||||||
|
|
||||||
|
### [3.6.1] — 2026-03-05
|
||||||
|
- Fix typo in `compress.sh`.
|
||||||
|
|
||||||
|
### [3.6.0] — 2026-03-05
|
||||||
|
- Improved `utaz` with broader multi-format support.
|
||||||
|
- Introduced `ppu` and `ppn`.
|
||||||
|
- Improved update system.
|
||||||
|
|
||||||
|
### [3.5.0] — 2026-03-04
|
||||||
|
- `rain` now has configurable speed and color.
|
||||||
|
- `showinfo` adapted to `fastfetch` (in addition to `neofetch`).
|
||||||
|
|
||||||
|
### [3.3.1] — 2022-02-24
|
||||||
|
- Fixed version detection.
|
||||||
|
- Added `busy`.
|
||||||
|
- Fixed use of library functions before loading.
|
||||||
|
|
||||||
|
### [3.3.0] — 2022-11-28
|
||||||
|
- Initial version update support.
|
||||||
|
- Changed versioning code.
|
||||||
|
- Added installation path detection.
|
||||||
|
|
||||||
|
### [3.2.3] — 2022-11-28
|
||||||
|
- Improved README.
|
||||||
|
|
||||||
|
### [3.2.2] — 2022-11-21
|
||||||
|
- Fixed `taz` compression level parsing.
|
||||||
|
- Fixed typo in `dpkgs`.
|
||||||
|
|
||||||
|
### [3.2.1] — 2022-11-20
|
||||||
|
- Fixed several messages.
|
||||||
|
- Made `dpkgs` RPM-aware (initial support).
|
||||||
|
- Removed version history from main script and reverted declaration order.
|
||||||
|
- Added required license information in all files.
|
||||||
|
- Completed `LICENSE` file.
|
||||||
|
|
||||||
|
### [3.2.0] — 2022-11-18
|
||||||
|
- Created `disp` command and integrated it across the codebase.
|
||||||
|
|
||||||
|
### [3.1.1] — 2022-11-10
|
||||||
|
- `genpwd`: added feasibility check for requested password constraints.
|
||||||
|
|
||||||
|
### [3.1.0] — 2022-11-08
|
||||||
|
- Added password generator.
|
||||||
|
|
||||||
|
### [3.0.1] — 2022-11-07
|
||||||
|
- Added concatenation option to `rmspc`.
|
||||||
|
- Added `ku`.
|
||||||
|
- Improved error handling in `meteo`.
|
||||||
|
|
||||||
|
### [3.0.0] — 2022-08-27
|
||||||
|
- Split code into several files/modules.
|
||||||
|
- Added `rain` screensaver.
|
||||||
|
|
||||||
|
### [2.8.2] — 2022-07-29
|
||||||
|
- Added warning for non-bash users.
|
||||||
|
|
||||||
|
### [2.8.1] — 2022-07-19
|
||||||
|
- Cleanup, fixes and optimizations.
|
||||||
|
|
||||||
|
### [2.8.0] — 2022-06-24
|
||||||
|
- Added `backtrace`, `error` and `settrace`.
|
||||||
|
- Bugfixes in `showinfo`.
|
||||||
|
|
||||||
|
### [2.7.1] — 2022-06-22
|
||||||
|
- Minor corrections.
|
||||||
|
- Added `help` command.
|
||||||
|
|
||||||
|
### [2.7.0] — 2022-06-21
|
||||||
|
- Added `isipv4` and `isipv6`, integrated into `rmhost`.
|
||||||
|
- Removed broken Konsole save/restore support.
|
||||||
|
|
||||||
|
### [2.6.3] — 2021-10-18
|
||||||
|
- Changed PS1 to status-bar style.
|
||||||
|
- Minor improvements.
|
||||||
|
|
||||||
|
### [2.6.2] — 2021-02-26
|
||||||
|
- Bugfix in `taz` for directories with trailing slash.
|
||||||
|
|
||||||
|
### [2.6.1] — 2020-12-25
|
||||||
|
- Added checks in `rmhost`.
|
||||||
|
- Improved `rmspc`.
|
||||||
|
- Created `expandlist`.
|
||||||
|
|
||||||
|
### [2.6.0] — 2020-10-24
|
||||||
|
- Added Konsole session save/restore.
|
||||||
|
|
||||||
|
### [2.5.3] — 2020-09-11
|
||||||
|
- Added aliases, improved code consistency and fixed typos.
|
||||||
|
- Improved `utaz`, removed `showdiskmap`, removed remaining French text.
|
||||||
|
- Added license information for future publication.
|
||||||
|
|
||||||
|
### [2.5.2] — 2020-03-06
|
||||||
|
- Sorted and improved aliases.
|
||||||
|
|
||||||
|
### [2.5.1] — 2020-03-05
|
||||||
|
- Language consistency fixes.
|
||||||
|
- Added `pigz` support in `taz`.
|
||||||
|
|
||||||
|
### [2.5.0] — 2020-03-03
|
||||||
|
- Added `taz` and `rmspc`.
|
||||||
|
- Renamed `auzip` to `utaz` and improved it.
|
||||||
|
|
||||||
|
### [2.4.0] — 2020-03-02
|
||||||
|
- Added `auzip`.
|
||||||
|
|
||||||
|
### [2.3.2] — 2020-01-31
|
||||||
|
- `figlet`: changed default font to `ansi_shadow`.
|
||||||
|
|
||||||
|
### [2.3.1] — 2020-01-16
|
||||||
|
- Bugfix: non-interactive shells were blocked by some functions.
|
||||||
|
|
||||||
|
### [2.3.0] — 2020-01-08
|
||||||
|
- Added `figlet` and `neofetch` as MOTD replacement.
|
||||||
|
|
||||||
|
### [2.2.0] — 2019-12-16
|
||||||
|
- Added `showinfo`.
|
||||||
|
- First implementation of `showdiskmap`.
|
||||||
|
|
||||||
|
### [2.1.2] — 2019-09-24
|
||||||
|
- Bugfix in profile version display.
|
||||||
|
|
||||||
|
### [2.1.1] — 2019-09-23
|
||||||
|
- Bugfix in `dpkgs`.
|
||||||
|
|
||||||
|
### [2.1.0] — 2018-09-16
|
||||||
|
- Added `rmhost`, `setc`, `setfr`.
|
||||||
|
- Improved locale management.
|
||||||
|
|
||||||
|
### [2.0.1] — 2017-02-04
|
||||||
|
- `clean` improvements (`--shell`).
|
||||||
|
|
||||||
|
### [2.0.0] — 2015-10-24
|
||||||
|
- Added advanced functions (`clean`, `ssr`, etc.).
|
||||||
|
|
||||||
|
### [1.0.0] — 2013-02-16
|
||||||
|
- Initial version.
|
||||||
|
|
||||||
|
### [Initial fork]
|
||||||
|
Forked default Bash profile from Beyond Linux From Scratch by
|
||||||
|
* James Robertson <jameswrobertson@earthlink.net>
|
||||||
|
* Dagmar d'Surreal <rivyqntzne@pbzpnfg.arg>
|
||||||
|
|||||||
@@ -87,6 +87,10 @@ TERM=xterm-256color
|
|||||||
# Prefix used by gwip when generating automatic checkpoint messages.
|
# Prefix used by gwip when generating automatic checkpoint messages.
|
||||||
#GIT_WIP_PREFIX=wip
|
#GIT_WIP_PREFIX=wip
|
||||||
|
|
||||||
|
# gacp: Automatically add all modified files (git add -A) when no explicit file
|
||||||
|
# list is provided. Set to 0 to require explicit file paths or the -a flag.
|
||||||
|
#GIT_GACP_AUTO_ADD=1
|
||||||
|
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
[info]
|
[info]
|
||||||
# meteo: Default city when no argument is given. Leave unset to require an
|
# meteo: Default city when no argument is given. Leave unset to require an
|
||||||
|
|||||||
147
history.txt
147
history.txt
@@ -1,147 +0,0 @@
|
|||||||
------------------------------------------------------------------------------
|
|
||||||
Initial version from Beyond Linux From Scratch by
|
|
||||||
* James Robertson <jameswrobertson@earthlink.net>
|
|
||||||
* Dagmar d'Surreal <rivyqntzne@pbzpnfg.arg>
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
Current version from Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
Version history:
|
|
||||||
------------------------------------------------------------------------------
|
|
||||||
# 05/03/2026 v3.6.1
|
|
||||||
Fix a typo in compress.sh
|
|
||||||
|
|
||||||
# 05/03/2026 v3.6.0
|
|
||||||
Improved utaz to make it multiformat with lot of it
|
|
||||||
Introduced ppu and ppn
|
|
||||||
Improved update system
|
|
||||||
|
|
||||||
# 04/03/2026 v3.5.0
|
|
||||||
rain has now configurable speed and color
|
|
||||||
showinfo adapted to fastfetch, replacing neofetch
|
|
||||||
|
|
||||||
# 24/02/2022 v3.3.1
|
|
||||||
Fixed version detection
|
|
||||||
Added "busy" function
|
|
||||||
Fixed use of library functions before it's loaded
|
|
||||||
|
|
||||||
# 28/11/2022 v3.3.0
|
|
||||||
Initial version update support
|
|
||||||
Changed versioning code
|
|
||||||
Added installation path detection
|
|
||||||
|
|
||||||
# 28/11/2022 v3.2.3
|
|
||||||
Made proper readme file, to improve
|
|
||||||
|
|
||||||
# 21/11/2022 v3.2.2
|
|
||||||
Fixed taz compression level analysis
|
|
||||||
Fixed typo in dpkgs
|
|
||||||
|
|
||||||
# 20/11/2022 v3.2.1
|
|
||||||
Fix some messages
|
|
||||||
Make dpkgs rpm aware (more to come)
|
|
||||||
Removed version history from main script and revert declaration order
|
|
||||||
Added required license information in all files
|
|
||||||
Completed LICENSE file
|
|
||||||
|
|
||||||
# 18/11/2022 v3.2.0
|
|
||||||
Created disp command for display and make use of it
|
|
||||||
|
|
||||||
# 10/11/2022 v3.1.1
|
|
||||||
genpwd: test if password is doable
|
|
||||||
|
|
||||||
# 08/11/2022 v3.1.0
|
|
||||||
Added password generator
|
|
||||||
|
|
||||||
# 07/11/2022 v3.0.1
|
|
||||||
Added concatenation to rmspc
|
|
||||||
Added ku
|
|
||||||
Error managed in meteo
|
|
||||||
|
|
||||||
# 27/08/2022 v3.0.0
|
|
||||||
Splitted everything in several files
|
|
||||||
Added rain screensaver
|
|
||||||
|
|
||||||
# 29/07/2022 v2.8.2
|
|
||||||
Added warning for non bash or zsh users
|
|
||||||
|
|
||||||
# 19/07/2022 v2.8.1
|
|
||||||
Few cleanups, fixes and optimizations
|
|
||||||
|
|
||||||
# 24/06/2022 v2.8.0
|
|
||||||
Added backtrace, error and settrace
|
|
||||||
[bugfix] corrected showinfo
|
|
||||||
|
|
||||||
# 22/06/2022 v2.7.1
|
|
||||||
[bugfix] few minor corrections
|
|
||||||
Added help command
|
|
||||||
|
|
||||||
# 21/06/2022 v2.7.0
|
|
||||||
Added isipv4 and isipv6 and use it in rmhost as an improvement
|
|
||||||
Removed konsole save and restore not working
|
|
||||||
|
|
||||||
# 18/10/2021 v2.6.3
|
|
||||||
Changed PS1 for status bar style version
|
|
||||||
Few minor improvements
|
|
||||||
|
|
||||||
# 26/02/2021 v2.6.2
|
|
||||||
[bugfix] taz: corrected bug with trailing slash on directories
|
|
||||||
|
|
||||||
# 25/12/2020 v2.6.1
|
|
||||||
Add check on rmhost
|
|
||||||
Improvements rmspc
|
|
||||||
Created expendlist
|
|
||||||
|
|
||||||
# 24/10/2020 v2.6.0
|
|
||||||
Added session save and restore for Konsole
|
|
||||||
|
|
||||||
# 11/09/2020 v2.5.3
|
|
||||||
Few more aliases, improved code consistancy and typo,
|
|
||||||
Improved utaz, removed showdiskmap, removed remaining French,
|
|
||||||
Added license information for future publication
|
|
||||||
|
|
||||||
# 06/03/2020 v2.5.2
|
|
||||||
Few aliases sorted out
|
|
||||||
|
|
||||||
# 05/03/2020 v2.5.1
|
|
||||||
Language consistancy fix
|
|
||||||
Added pigz support in taz
|
|
||||||
|
|
||||||
# 03/03/2020 v2.5.0
|
|
||||||
Added command taz and rmspc
|
|
||||||
Renamed auzip => utaz and improved it
|
|
||||||
|
|
||||||
# 02/03/2020 v2.4.0
|
|
||||||
Added command auzip
|
|
||||||
|
|
||||||
# 31/01/2020 v2.3.2
|
|
||||||
Figlet: changed default font to ansi_shadow
|
|
||||||
|
|
||||||
# 16/01/2020 v2.3.1
|
|
||||||
[bugfix] non-interactive were blocked with some functions
|
|
||||||
|
|
||||||
# 08/01/2020 v2.3.0
|
|
||||||
Added use of figlet and neofetch as a motd replace
|
|
||||||
|
|
||||||
# 16/12/2019 v2.2.0
|
|
||||||
Added showinfo
|
|
||||||
Primary write of showdiskmap
|
|
||||||
|
|
||||||
# 24/09/2019 v2.1.2
|
|
||||||
[bugfix] bug in profile version display
|
|
||||||
|
|
||||||
# 23/09/2019 v2.1.1
|
|
||||||
[bugfix] dpkgs
|
|
||||||
|
|
||||||
# 16/09/2018 v2.1.0
|
|
||||||
Added rmhost, setc, setfr
|
|
||||||
More locales management
|
|
||||||
|
|
||||||
# 04/02/2017 v2.0.1
|
|
||||||
clean improvements (--shell)
|
|
||||||
|
|
||||||
# 24/10/2015 v2.0.0
|
|
||||||
Added advanced functionnalities (clean, srr, etc.)
|
|
||||||
|
|
||||||
# 16/02/2013 v1.0.0
|
|
||||||
Initial version
|
|
||||||
|
|
||||||
@@ -40,6 +40,7 @@
|
|||||||
: "${GIT_MAIN_BRANCH:=main}"
|
: "${GIT_MAIN_BRANCH:=main}"
|
||||||
: "${GIT_DEFAULT_REMOTE:=origin}"
|
: "${GIT_DEFAULT_REMOTE:=origin}"
|
||||||
: "${GIT_WIP_PREFIX:=wip}"
|
: "${GIT_WIP_PREFIX:=wip}"
|
||||||
|
: "${GIT_GACP_AUTO_ADD:=1}"
|
||||||
|
|
||||||
|
|
||||||
# ------------------------------------------------------------------------------
|
# ------------------------------------------------------------------------------
|
||||||
@@ -231,7 +232,7 @@ export -f gsync
|
|||||||
gacp()
|
gacp()
|
||||||
{
|
{
|
||||||
local PARSED
|
local PARSED
|
||||||
PARSED=$(getopt -o hm: --long help,message: -n 'gacp' -- "$@")
|
PARSED=$(getopt -o ham: --long help,auto,message: -n 'gacp' -- "$@")
|
||||||
# shellcheck disable=SC2181 # getopt return code is checked immediately after
|
# shellcheck disable=SC2181 # getopt return code is checked immediately after
|
||||||
if [[ $? -ne 0 ]]; then
|
if [[ $? -ne 0 ]]; then
|
||||||
disp E "Invalid options, use \"gacp --help\" to display usage."
|
disp E "Invalid options, use \"gacp --help\" to display usage."
|
||||||
@@ -239,20 +240,26 @@ gacp()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
eval set -- "$PARSED"
|
eval set -- "$PARSED"
|
||||||
local msg=""
|
local msg="" auto_add="$GIT_GACP_AUTO_ADD"
|
||||||
while true; do
|
while true; do
|
||||||
case "$1" in
|
case "$1" in
|
||||||
-h|--help)
|
-h|--help)
|
||||||
printf "gacp: Run git add, git commit, and git push in one command.\n"
|
printf "gacp: Run git add, git commit, and git push in one command.\n"
|
||||||
printf "Usage: gacp -m \"message\" [file1 file2 ...]\n"
|
printf "Usage: gacp [-a] -m \"message\" [file1 file2 ...]\n"
|
||||||
printf "Options:\n"
|
printf "Options:\n"
|
||||||
|
printf "\t-a, --auto\tAutomatically add all modified files (git add -A)\n"
|
||||||
printf "\t-m, --message\tCommit message (mandatory)\n"
|
printf "\t-m, --message\tCommit message (mandatory)\n"
|
||||||
printf "\n"
|
printf "\n"
|
||||||
printf "If files are provided, only those paths are added.\n"
|
printf "If files are provided, only those paths are added (-a is ignored).\n"
|
||||||
printf "If no file is provided, all changes are added with git add -A.\n"
|
printf "If no file is provided and -a is active, all changes are added with git add -A.\n"
|
||||||
|
printf "Default for -a can be set via GIT_GACP_AUTO_ADD in profile.conf.\n"
|
||||||
printf "If the remote branch moved forward, gacp pulls with rebase before pushing.\n"
|
printf "If the remote branch moved forward, gacp pulls with rebase before pushing.\n"
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
|
-a|--auto)
|
||||||
|
auto_add=1
|
||||||
|
shift
|
||||||
|
;;
|
||||||
-m|--message)
|
-m|--message)
|
||||||
msg="$2"
|
msg="$2"
|
||||||
shift 2
|
shift 2
|
||||||
@@ -275,16 +282,20 @@ gacp()
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local branch upstream remote tracking_branch ahead behind counts
|
local branch upstream remote tracking_branch behind counts
|
||||||
branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) || return 1
|
branch=$(git rev-parse --abbrev-ref HEAD 2>/dev/null) || return 1
|
||||||
upstream=$(git rev-parse --abbrev-ref --symbolic-full-name '@{u}' 2>/dev/null) || true
|
upstream=$(git rev-parse --abbrev-ref --symbolic-full-name '@{u}' 2>/dev/null) || true
|
||||||
|
|
||||||
if [[ $# -gt 0 ]]; then
|
if [[ $# -gt 0 ]]; then
|
||||||
|
auto_add=0
|
||||||
disp I "Adding selected paths..."
|
disp I "Adding selected paths..."
|
||||||
git add -- "$@" || return 1
|
git add -- "$@" || return 1
|
||||||
else
|
elif [[ $auto_add -eq 1 ]]; then
|
||||||
disp I "Adding all changes..."
|
disp I "Adding all changes..."
|
||||||
git add -A || return 1
|
git add -A || return 1
|
||||||
|
else
|
||||||
|
disp E "No files specified. Use -a/--auto or provide file paths."
|
||||||
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if git diff --cached --quiet; then
|
if git diff --cached --quiet; then
|
||||||
@@ -308,7 +319,7 @@ gacp()
|
|||||||
|
|
||||||
if git rev-parse --verify --quiet "refs/remotes/${remote}/${tracking_branch}" >/dev/null; then
|
if git rev-parse --verify --quiet "refs/remotes/${remote}/${tracking_branch}" >/dev/null; then
|
||||||
counts=$(git rev-list --left-right --count HEAD..."${remote}/${tracking_branch}" 2>/dev/null) || return 1
|
counts=$(git rev-list --left-right --count HEAD..."${remote}/${tracking_branch}" 2>/dev/null) || return 1
|
||||||
read -r ahead behind <<< "$counts"
|
read -r _ behind <<< "$counts"
|
||||||
if [[ ${behind:-0} -gt 0 ]]; then
|
if [[ ${behind:-0} -gt 0 ]]; then
|
||||||
disp I "Remote branch is ahead, rebasing before push..."
|
disp I "Remote branch is ahead, rebasing before push..."
|
||||||
git pull --rebase "$remote" "$tracking_branch" || return 1
|
git pull --rebase "$remote" "$tracking_branch" || return 1
|
||||||
|
|||||||
Reference in New Issue
Block a user