aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-25 15:52:44 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-05-25 15:52:59 +0100
commitc1b1ec73186b77a69b1df9f4a5933014c16b1b6b (patch)
tree9db8a2b8c3b09ecf06c73ba7f7b63af350d63788
parent2ac12e7e1465b23b5f9b40726810c7323ae2cfed (diff)
downloadpaludis-c1b1ec73186b77a69b1df9f4a5933014c16b1b6b.tar.gz
paludis-c1b1ec73186b77a69b1df9f4a5933014c16b1b6b.tar.xz
--reset is now default for git syncing
-rw-r--r--NEWS7
-rw-r--r--paludis/syncers/dogit.in13
2 files changed, 16 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index 8a9e44e..72427a4 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,13 @@ News for Paludis
This file lists the major changes between versions. For a more detailed list
of every change, see the ChangeLog.
+0.48.0:
+ * --reset is now the default for git syncers. If Paludis is used to sync a
+ git repository with modifications, those modifications will be lost. Use
+ --no-reset to stay with the old (git pull) behaviour, but note that it is
+ probably better to change your workflow such that Paludis never directly
+ works with any repository it does not manage.
+
0.46.0:
* We can now read environment.bz2 files from VDB created by newer Portage
versions.
diff --git a/paludis/syncers/dogit.in b/paludis/syncers/dogit.in
index 2f9e257..13a3136 100644
--- a/paludis/syncers/dogit.in
+++ b/paludis/syncers/dogit.in
@@ -20,7 +20,7 @@ GIT_PULL_OPTIONS=( )
GIT_FETCH_OPTIONS=( )
GIT_BRANCH=
-GIT_USE_RESET=false
+GIT_USE_RESET=true
while [[ $# -gt 0 ]]; do
case "${1}" in
@@ -42,9 +42,14 @@ while [[ $# -gt 0 ]]; do
;;
--reset)
+ ewarn "--reset is now the default for git syncers. It should no longer be specified manually."
GIT_USE_RESET=true
;;
+ --no-reset)
+ GIT_USE_RESET=false
+ ;;
+
--help)
PROTO="${0##*/do}"
if [[ "${PROTO}" == git ]]; then
@@ -64,9 +69,9 @@ while [[ $# -gt 0 ]]; do
echo " Options:"
echo " --branch=BRANCH Specify the branch to use"
echo " --git-clone-option=OPTION Pass OPTION to git clone"
- echo " --git-pull-option=OPTION Pass OPTION to git pull"
- echo " --git-fetch-option=OPTION Pass OPTION to git fetch (if --reset)"
- echo " --reset Use git fetch and git reset --hard instead of pull"
+ echo " --git-pull-option=OPTION Pass OPTION to git pull (if --no-reset)"
+ echo " --git-fetch-option=OPTION Pass OPTION to git fetch (unless --no-reset)"
+ echo " --no-reset Use git pull instead of git fetch and git reset --hard"
exit 0
;;