Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/rebase-interative-eval-fix'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 17 May 2016 21:38:35 +0000
(14:38 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 17 May 2016 21:38:35 +0000
(14:38 -0700)
Portability enhancement for "rebase -i" to help platforms whose
shell does not like "for i in <empty>" (which is not POSIX-kosher).
* jk/rebase-interative-eval-fix:
rebase--interactive: avoid empty list in shell for-loop
1
2
git-rebase--interactive.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
compact
(merge:
6bfb7de
8e98b35
)
diff --combined
git-rebase--interactive.sh
index 9ea30756f13349c96784f0091da4c3c667166485,655ebaa4717fe6e43b4b16a69e5eb282140edd6d..1c6dfb6d5618f43eaac1c279332d33e6a913c2d9
---
1
/
git-rebase--interactive.sh
---
2
/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@@
-82,6
-82,7
+82,7
@@@
rewritten_pending="$state_dir"/rewritte
cr=$(printf "\015")
strategy_args=${strategy:+--strategy=$strategy}
+ test -n "$strategy_opts" &&
eval '
for strategy_opt in '"$strategy_opts"'
do
@@@
-548,8
-549,7
+549,8
@@@
do_next ()
mark_action_done
do_pick $sha1 "$rest"
- warn "Stopped at $sha1... $rest"
+ sha1_abbrev=$(git rev-parse --short $sha1)
+ warn "Stopped at $sha1_abbrev... $rest"
exit_with_patch $sha1 0
;;
squash|s|fixup|f)