summaryrefslogtreecommitdiffstats
path: root/scripts/lib/ptxd_make_world_patchin.sh
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2010-06-04 17:01:23 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2010-06-04 17:10:07 +0200
commit3bed5b2a096d05948c722b48331e1fb84a474de4 (patch)
treeaba0a864d20babb73cf3eda35ea80afa9cf2949c /scripts/lib/ptxd_make_world_patchin.sh
parentdbfb735fad7b7532d36f4596494111e32c8219d6 (diff)
downloadptxdist-3bed5b2a096d05948c722b48331e1fb84a474de4.tar.gz
ptxdist-3bed5b2a096d05948c722b48331e1fb84a474de4.tar.xz
[patching] don't specify the directory when calling git init
* it's unnecessary because that's the current directory * older git versions can't handle it Based on a patch from Remy Bohmer <linux@bohmer.net> Also: fix the error propagation. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib/ptxd_make_world_patchin.sh')
-rw-r--r--scripts/lib/ptxd_make_world_patchin.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/ptxd_make_world_patchin.sh b/scripts/lib/ptxd_make_world_patchin.sh
index 80a50e9d7..158acb931 100644
--- a/scripts/lib/ptxd_make_world_patchin.sh
+++ b/scripts/lib/ptxd_make_world_patchin.sh
@@ -81,11 +81,11 @@ ptxd_make_world_patchin_apply_git_init()
# is already git repo?
if [ "${git_dir}" != ".git" ]; then
echo "patchin: git: initializing repository"
- git init -q "${pkg_patchin_dir}" &&
+ git init -q &&
git add -f . &&
git commit -q -m "initial commit" --author="ptxdist-${PTXDIST_VERSION_FULL} <ptxdist@pengutronix.de>" &&
- git tag "${pkg_pkg}"
- git tag base
+ git tag "${pkg_pkg}" &&
+ git tag base &&
echo "patchin: git: done"
fi
}