Make xargs commands less dangerous

git-tips · Dec 30, 2016 · 3951f4c · 3951f4c
1 parent 5d23b75
commit 3951f4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -225,13 +225,13 @@ git checkout -
 
 ## Remove branches that have already been merged with master
 ```sh
-git branch --merged master | grep -v '^\*' | xargs -n 1 git branch -d
+git branch --merged master | grep -v '^\*' | sed 's/^ \+//' | xargs -d '\n' -n 1 git branch -d
 ```
 
 
 __Alternatives:__
 ```sh
-git branch --merged master | grep -v '^\*\|  master' | xargs -n 1 git branch -d # will not delete master if master is not checked out
+git branch --merged master | grep -v '^\*\| master' | sed 's/^ \+//' | xargs -d '\n' -n 1 git branch -d # will not delete master if master is not checked out
 ```
 
 ## List all branches and their upstreams, as well as last commit on branch

diff --git a/tips.json b/tips.json
@@ -37,8 +37,8 @@
     "tip": "git checkout -"
 }, {
     "title": "Remove branches that have already been merged with master",
-    "tip": "git branch --merged master | grep -v '^\\*' | xargs -n 1 git branch -d",
-    "alternatives": ["git branch --merged master | grep -v '^\\*\\|  master' | xargs -n 1 git branch -d # will not delete master if master is not checked out"]
+    "tip": "git branch --merged master | grep -v '^\\*' | sed 's/^ \\+//' | xargs -d '\\n' -n 1 git branch -d",
+    "alternatives": ["git branch --merged master | grep -v '^\\*\\| master' | sed 's/^ \\+//' | xargs -d '\\n' -n 1 git branch -d # will not delete master if master is not checked out"]
 }, {
     "title": "List all branches and their upstreams, as well as last commit on branch",
     "tip": "git branch -vv"
@@ -440,4 +440,4 @@
 }, {
     "title": "Preformatted patch file.",
     "tip": "git format-patch -M upstream..topic"
-}]
+}]