diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /git-quiltimport.sh | |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff) | |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 (diff) | |
| download | git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.gz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'git-quiltimport.sh')
| -rwxr-xr-x | git-quiltimport.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-quiltimport.sh b/git-quiltimport.sh index 10135da3ac..2ae1f20c2e 100755 --- a/git-quiltimport.sh +++ b/git-quiltimport.sh @@ -89,7 +89,7 @@ for patch_name in $(cat "$QUILT_PATCHES/series" | grep -v '^#'); do echo "No author found in $patch_name" >&2; echo "---" cat $tmp_msg - echo -n "Author: "; + printf "Author: "; read patch_author echo "$patch_author" |