# [PATCH] bundle: detect if bundle file cannot be created 3 messages from 2010-08-26 to 2010-08-27. Participants: Csaba Henk, Junio C Hamano. Thread: https://gitlist.dev/t/24867 ## Csaba Henk, 2010-08-26 09:23 Subject: [PATCH] bundle: detect if bundle file cannot be created Message-ID: <20100826092333.GB32617@acharya.in.gluster.com> URL: https://gitlist.dev/e/20100826092333.GB32617%40acharya.in.gluster.com ``` bundle command silently died with no sign of failure if it could not create the bundle file. (Eg.: its path resovles to a directory, or the parent dir is sticky while file already exists and is owned by someone else.) --- bundle.c | 6 ++++-- t/t5704-bundle.sh | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bundle.c b/bundle.c index ff97adc..3eb4ca2 100644 --- a/bundle.c +++ b/bundle.c @@ -372,8 +372,10 @@ int create_bundle(struct bundle_header *header, const char *path, close(rls.in); if (finish_command(&rls)) return error ("pack-objects died"); - if (!bundle_to_stdout) - commit_lock_file(&lock); + if (!bundle_to_stdout) { + if (commit_lock_file(&lock)) + die_errno("cannot create bundle file"); + } return 0; } diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index ddc3dc5..728ccd8 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -30,6 +30,13 @@ test_expect_success 'tags can be excluded by rev-list options' ' ' +test_expect_success 'die if bundle file cannot be created' ' + + mkdir adir && + test_must_fail git bundle create adir --all + +' + test_expect_failure 'bundle --stdin' ' echo master | git bundle create stdin-bundle.bdl --stdin && -- 1.7.2.2 ``` ## Junio C Hamano, 2010-08-26 17:26 Subject: Re: [PATCH] bundle: detect if bundle file cannot be created Message-ID: <7vpqx5l1yc.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vpqx5l1yc.fsf%40alter.siamese.dyndns.org In-Reply-To: <20100826092333.GB32617@acharya.in.gluster.com> ``` Csaba Henk writes: > bundle command silently died with no sign of failure if it > could not create the bundle file. (Eg.: its path resovles to a directory, > or the parent dir is sticky while file already exists and is owned > by someone else.) > --- Sign-off? > diff --git a/bundle.c b/bundle.c > index ff97adc..3eb4ca2 100644 > --- a/bundle.c > +++ b/bundle.c > @@ -372,8 +372,10 @@ int create_bundle(struct bundle_header *header, const char *path, > close(rls.in); > if (finish_command(&rls)) > return error ("pack-objects died"); > - if (!bundle_to_stdout) > - commit_lock_file(&lock); > + if (!bundle_to_stdout) { > + if (commit_lock_file(&lock)) > + die_errno("cannot create bundle file"); > + } You would want to parrot the path given by the caller, perhaps like this? die_errno("cannot create '%s'", path) This function tries to report error to the caller in some places but rudely dies in some other places, so dying here is not a serious offence. > diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh > index ddc3dc5..728ccd8 100755 > --- a/t/t5704-bundle.sh > +++ b/t/t5704-bundle.sh > @@ -30,6 +30,13 @@ test_expect_success 'tags can be excluded by rev-list options' ' > > ' > > +test_expect_success 'die if bundle file cannot be created' ' > + > + mkdir adir && > + test_must_fail git bundle create adir --all > + > +' I like it ;-) Thanks. ``` ## Csaba Henk, 2010-08-27 20:31 Subject: [PATCH v2] bundle: detect if bundle file cannot be created Message-ID: URL: https://gitlist.dev/e/i597bj%24vtg%241%40dough.gmane.org In-Reply-To: <20100826092333.GB32617@acharya.in.gluster.com> ``` bundle command silently died with no sign of failure if it could not create the bundle file. (Eg.: its path resovles to a directory, or the parent dir is sticky while file already exists and is owned by someone else.) Signed-off-by: Csaba Henk --- bundle.c | 6 ++++-- t/t5704-bundle.sh | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bundle.c b/bundle.c index ff97adc..65ea26b 100644 --- a/bundle.c +++ b/bundle.c @@ -372,8 +372,10 @@ int create_bundle(struct bundle_header *header, const char *path, close(rls.in); if (finish_command(&rls)) return error ("pack-objects died"); - if (!bundle_to_stdout) - commit_lock_file(&lock); + if (!bundle_to_stdout) { + if (commit_lock_file(&lock)) + die_errno("cannot create '%s'", path); + } return 0; } diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index ddc3dc5..728ccd8 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -30,6 +30,13 @@ test_expect_success 'tags can be excluded by rev-list options' ' ' +test_expect_success 'die if bundle file cannot be created' ' + + mkdir adir && + test_must_fail git bundle create adir --all + +' + test_expect_failure 'bundle --stdin' ' echo master | git bundle create stdin-bundle.bdl --stdin && -- 1.7.2.2 ```