綾小路龍之介の素人思考

[git] 新しいファイルを追加

dia で作った画像ファイルをリポジトリに追加するまでの手順を記録しておく

まずは必要なファイルをコピー。

$ mkdir ja-JP/images/
$ cp -a en-US/images/autobuilder.dia ja-JP/images/
$ cp -a en-US/images/release-cycle.dia ja-JP/images/
$ cp -a en-US/images/package-lifecycle.dia ja-JP/images/
$ cp -a en-US/images/gnome-mime-application-x-deb.png ja-JP/images/
$ cp -a en-US/images/package.png ja-JP/images/

開いて編集して、最後にpngファイルにexport。

$ cd ja-JP/images/
$ export DISPLAY=localhost:10.0
$ dia autobuilder.dia
$ dia --export autobuilder.png autobuilder.dia
autobuilder.dia --> autobuilder.png
$ dia release-cycle.dia
$ dia --export release-cycle.png release-cycle.dia
release-cycle.dia --> release-cycle.png
$ dia package-lifecycle.dia
$ dia --export package-lifecycle.png package-lifecycle.dia
package-lifecycle.png --> package-lifecycle.png
$ cd ../../

git に使ったファイルを登録して、登録ファイルの確認、現在の状況を確認、最後にcommit。

$ git add ja-JP/images/*
$ git ls-files ja-JP/images/
ja-JP/images/autobuilder.dia
ja-JP/images/autobuilder.png
ja-JP/images/gnome-mime-application-x-deb.png
ja-JP/images/package-lifecycle.dia
ja-JP/images/package-lifecycle.png
ja-JP/images/package.png
ja-JP/images/release-cycle.dia
ja-JP/images/release-cycle.png
$ git status
# On branch wheezy/master_translation_ja_work
# Your branch is ahead of 'origin/wheezy/master' by 51 commits.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       new file:   ja-JP/images/autobuilder.dia
#       new file:   ja-JP/images/autobuilder.png
#       new file:   ja-JP/images/gnome-mime-application-x-deb.png
#       new file:   ja-JP/images/package-lifecycle.dia
#       new file:   ja-JP/images/package-lifecycle.png
#       new file:   ja-JP/images/package.png
#       new file:   ja-JP/images/release-cycle.dia
#       new file:   ja-JP/images/release-cycle.png
#
$ git commit -a -vv -m 'translation: update'
[wheezy/master_translation_ja_work 9e19153] translation: update
 8 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 ja-JP/images/autobuilder.dia
 create mode 100644 ja-JP/images/autobuilder.png
 create mode 100644 ja-JP/images/gnome-mime-application-x-deb.png
 create mode 100644 ja-JP/images/package-lifecycle.dia
 create mode 100644 ja-JP/images/package-lifecycle.png
 create mode 100644 ja-JP/images/package.png
 create mode 100644 ja-JP/images/release-cycle.dia
 create mode 100644 ja-JP/images/release-cycle.png

あと、本家リポジトリに登録するまではいつも通りの作業で。

$ git pull
Enter passphrase for key '/**************/.ssh/id_rsa':
Already up-to-date.
$ git checkout wheezy/master_translation_ja
Switched to branch 'wheezy/master_translation_ja'
$ git pull
Enter passphrase for key '/**************/.ssh/id_rsa':
Already up-to-date.
$ git diff --name-only wheezy/master_translation_ja_work
ja-JP/01_the-debian-project.po
ja-JP/02_case-study.po
ja-JP/images/autobuilder.dia
ja-JP/images/autobuilder.png
ja-JP/images/gnome-mime-application-x-deb.png
ja-JP/images/package-lifecycle.dia
ja-JP/images/package-lifecycle.png
ja-JP/images/package.png
ja-JP/images/release-cycle.dia
ja-JP/images/release-cycle.png
$ git merge --squash wheezy/master_translation_ja_work
Updating ddd3690..9e19153
Fast-forward
Squash commit -- not updating HEAD
 ja-JP/01_the-debian-project.po                |   40 ++++++++++++++++++++--------------------
 ja-JP/02_case-study.po                        |   51 ++++++++++++++++++++++++++-------------------------
 ja-JP/images/autobuilder.dia                  |  Bin 0 -> 3081 bytes
 ja-JP/images/autobuilder.png                  |  Bin 0 -> 67074 bytes
 ja-JP/images/gnome-mime-application-x-deb.png |  Bin 0 -> 4156 bytes
 ja-JP/images/package-lifecycle.dia            |  Bin 0 -> 6128 bytes
 ja-JP/images/package-lifecycle.png            |  Bin 0 -> 127224 bytes
 ja-JP/images/package.png                      |  Bin 0 -> 3825 bytes
 ja-JP/images/release-cycle.dia                |  Bin 0 -> 2026 bytes
 ja-JP/images/release-cycle.png                |  Bin 0 -> 27484 bytes
 10 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 ja-JP/images/autobuilder.dia
 create mode 100644 ja-JP/images/autobuilder.png
 create mode 100644 ja-JP/images/gnome-mime-application-x-deb.png
 create mode 100644 ja-JP/images/package-lifecycle.dia
 create mode 100644 ja-JP/images/package-lifecycle.png
 create mode 100644 ja-JP/images/package.png
 create mode 100644 ja-JP/images/release-cycle.dia
 create mode 100644 ja-JP/images/release-cycle.png
$ git commit -a -vv -m 'ja-JP: update Japanese translations'
[wheezy/master_translation_ja b13a103] ja-JP: update Japanese translations
 10 files changed, 46 insertions(+), 45 deletions(-)
 create mode 100644 ja-JP/images/autobuilder.dia
 create mode 100644 ja-JP/images/autobuilder.png
 create mode 100644 ja-JP/images/gnome-mime-application-x-deb.png
 create mode 100644 ja-JP/images/package-lifecycle.dia
 create mode 100644 ja-JP/images/package-lifecycle.png
 create mode 100644 ja-JP/images/package.png
 create mode 100644 ja-JP/images/release-cycle.dia
 create mode 100644 ja-JP/images/release-cycle.png
$ git log --color --stat --pretty=fuller -1
commit b13a10305433e9a1a3de4ea54ce4e28e74072211
Author:     AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>
AuthorDate: Sat Apr 11 23:43:12 2015 +0900
Commit:     AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>
CommitDate: Sat Apr 11 23:43:12 2015 +0900

    ja-JP: update Japanese translations

 ja-JP/01_the-debian-project.po                |   40 ++++++++++++++++++++--------------------
 ja-JP/02_case-study.po                        |   51 ++++++++++++++++++++++++++-------------------------
 ja-JP/images/autobuilder.dia                  |  Bin 0 -> 3081 bytes
 ja-JP/images/autobuilder.png                  |  Bin 0 -> 67074 bytes
 ja-JP/images/gnome-mime-application-x-deb.png |  Bin 0 -> 4156 bytes
 ja-JP/images/package-lifecycle.dia            |  Bin 0 -> 6128 bytes
 ja-JP/images/package-lifecycle.png            |  Bin 0 -> 127224 bytes
 ja-JP/images/package.png                      |  Bin 0 -> 3825 bytes
 ja-JP/images/release-cycle.dia                |  Bin 0 -> 2026 bytes
 ja-JP/images/release-cycle.png                |  Bin 0 -> 27484 bytes
 10 files changed, 46 insertions(+), 45 deletions(-)
$ git push origin wheezy/master_translation_ja:wheezy/master
Enter passphrase for key '/**************/.ssh/id_rsa':
Counting objects: 16, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 221.86 KiB, done.
Total 12 (delta 4), reused 0 (delta 0)
remote: Sending notification emails to: debian-handbook_cvs@packages.qa.debian.org
To git+ssh://ayanokouzi-guest@alioth.debian.org//git/debian-handbook/debian-handbook.git
   ddd3690..b13a103  wheezy/master_translation_ja -> wheezy/master
$ git checkout wheezy/master_translation_ja_work
Switched to branch 'wheezy/master_translation_ja_work'
Your branch and 'origin/wheezy/master' have diverged,
and have 52 and 1 different commit each, respectively.
$ git pull
Enter passphrase for key '/**************/.ssh/id_rsa':

リファレンス

  1. Reference: Command Line Options
  2. dia

ソーシャルブックマーク

  1. はてなブックマーク
  2. Google Bookmarks
  3. del.icio.us

ChangeLog

  1. Posted: 2008-08-23T23:40:55+09:00
  2. Modified: 2008-08-23T23:40:55+09:00
  3. Generated: 2017-11-21T23:09:16+09:00