* [PATCH 2/2] git-am: support StGit patch series
@ 2009-05-24 7:19 Giuseppe Bilotta
0 siblings, 0 replies; only message in thread
From: Giuseppe Bilotta @ 2009-05-24 7:19 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Giuseppe Bilotta
Stacked Git exports patch series with an 'index', a file containing
the list of the exported patches by filename. The file can be detected
by the '# This series applies on GIT commit somehash' header, and in
such a case git-am can replace its argument list with the list of files
taken from the index, proceeding then to import the whole series.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
---
git-am.sh | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index 578780b..d65e3c1 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -274,6 +274,28 @@ else
done
shift
fi
+ # if a single argument was passed, check if it's a StGit patch series
+ # index by checking if the first line begins with '# This series'
+ if test $# = 1
+ then
+ read is_sharp is_this is_series is_therest < "$1"
+ if test x"$is_sharp $is_this $is_series" = 'x# This series'
+ then
+ # replace the argument list with the files listed
+ # in the series index, prefixing them with the
+ # series index dirname
+ series_dir=`dirname "$1"`
+ while read filename
+ do
+ set "$@" "$series_dir/$filename"
+ done < "$1"
+ # remove the series index name
+ shift
+ # and skip the first line of the series
+ # index, which was the comment
+ shift
+ fi
+ fi
git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
rm -fr "$dotest"
exit 1
--
1.6.3.1.212.g6c0d3.dirty
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-24 7:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-24 7:19 [PATCH 2/2] git-am: support StGit patch series Giuseppe Bilotta
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).