[LU-1053] git commits fail when deleting files in the repo

• Type: Bug
• Resolution: Fixed
• Priority: Minor
• Fix Version/s: Lustre 2.2.0, Lustre 2.3.0
• Severity: 3
• Assignee: Andreas Dilger
• Reporter: James A Simmons

Description

Recently I updated the SuSE ldiskfs port due to changes in the RHEL6.2 code. So for some cleanup I removed patches that are longer needed. When I sent to push the commit it wouldn't due to the delete files but instead saw it as a error in the format of the patch.

Issue Links

• Trackbacks: Changelog 2.2 version 2.2.0 Support for networks: o2iblnd OFED 1.5.4 Server support for kernels: 2.6.32220.4.2.el6 (RHEL6) Client support for unpatched kernels: 2.6.18274.18.1.el5 (RHEL5) 2.6.32220.4.2.el6 (RHEL6) 2.6.32.360....

Comments

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,server,el5,inkernel #460
LU-1053 build: allow deleted/chmod in commit-msg (Revision 9fd0df600f0556877174ff31d8da3a232e37d815)

Result = SUCCESS
Oleg Drokin : 9fd0df600f0556877174ff31d8da3a232e37d815
Files :

• build/test-commit-msg.sh
• build/commit.ok_deleted
• build/commit.ok_chmod
• build/commit-msg
• build/commit.ok_diff

[Build Master (Inactive)]

Integrated in lustre-master » i686,server,el6,inkernel #460
LU-1053 build: allow deleted/chmod in commit-msg (Revision 9fd0df600f0556877174ff31d8da3a232e37d815)

Result = SUCCESS
Oleg Drokin : 9fd0df600f0556877174ff31d8da3a232e37d815
Files :

• build/test-commit-msg.sh
• build/commit.ok_chmod
• build/commit.ok_diff
• build/commit.ok_deleted
• build/commit-msg

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,el6,inkernel #460
LU-1053 build: allow deleted/chmod in commit-msg (Revision 9fd0df600f0556877174ff31d8da3a232e37d815)

Result = SUCCESS
Oleg Drokin : 9fd0df600f0556877174ff31d8da3a232e37d815
Files :

• build/commit-msg
• build/commit.ok_diff
• build/commit.ok_chmod
• build/commit.ok_deleted
• build/test-commit-msg.sh

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,client,el5,ofa #460
LU-1053 build: allow deleted/chmod in commit-msg (Revision 9fd0df600f0556877174ff31d8da3a232e37d815)

Result = SUCCESS
Oleg Drokin : 9fd0df600f0556877174ff31d8da3a232e37d815
Files :

• build/commit.ok_deleted
• build/commit-msg
• build/commit.ok_chmod
• build/commit.ok_diff
• build/test-commit-msg.sh

[Build Master (Inactive)]

Integrated in lustre-master » x86_64,server,el5,ofa #460
LU-1053 build: allow deleted/chmod in commit-msg (Revision 9fd0df600f0556877174ff31d8da3a232e37d815)

Result = SUCCESS
Oleg Drokin : 9fd0df600f0556877174ff31d8da3a232e37d815
Files :

• build/commit.ok_diff
• build/commit.ok_deleted
• build/test-commit-msg.sh
• build/commit-msg
• build/commit.ok_chmod

[Peter Jones]

reassigning to Andreas

[Andreas Dilger]

I've already got a patch for this. James and I discussed it in private email, but he neglected to mention this in the bug...

The patch is coincidentally in http://review.whamcloud.com/2053.

[Peter Jones]

Cliff

Could you please look into this one?

Thanks

Peter

[James A Simmons]

Here is a good test of what I'm seeing.

git status

1. On branch master
2. Changes to be committed:
3. (use "git reset HEAD <file>..." to unstage)
   #
4. deleted: ldiskfs/kernel_patches/patches/export-ext4-2.6-sles11.patch

git commit -av

LU-335 ldiskfs: SuSE 11 SP1 support for Lustre 2.X

The ext4 code difference between SuSE and RHEL6 is very small.
Because of to this ldiskfs support for SuSE servers is mostly
based the RHEL6 ldisk work. Recently Lustre support migrated
to RHEL6.2 support which required the SuSE port to be updated.
This patch provides this update which works for the SuSE
2.6.32.45 kernel as well as remove some no longer needed
ldsiskfs patches for older SuSE releases.

Signed-off-by: James Simmons <[e-mail]>

Then you get this error:

line 29: diff --git a/ldiskfs/kernel_patches/patches/export-ext4-2.6-sles11.patch b/ldiskfs/kernel_patches/patches/export-ext4-2.6-sles11.patch
deleted file mode 100644
error: commit message invalid signoff section line
line 30: index aa288b9..0000000