diff options
author | Thomas Wolf <twolf@apache.org> | 2023-10-08 21:50:34 +0200 |
---|---|---|
committer | Thomas Wolf <twolf@apache.org> | 2023-10-14 23:33:11 +0200 |
commit | 621685d3ca5fbaba37a8fc79b347644b3e4425c0 (patch) | |
tree | e8d97f4539f6c16ed19b0cdbb2e0bc38a9c2e4dc /org.eclipse.jgit/resources/org/eclipse/jgit/internal | |
parent | ecf94d1595c23b410d460e05a0d0bba60a443cd7 (diff) | |
download | jgit-621685d3ca5fbaba37a8fc79b347644b3e4425c0.tar.gz jgit-621685d3ca5fbaba37a8fc79b347644b3e4425c0.zip |
DeleteBranchCommand: update config only at the end
When multiple branches were to be removed, the git config was updated
after each and every branch. Newly do so only once at the end, after all
branches have been deleted.
Because there may be an exception after some branches have already been
deleted, take care to update the config even if an exception is thrown.
Bug: 451508
Change-Id: I645be8a1a59a1476d421e46933c3f7cbd0639fec
Signed-off-by: Thomas Wolf <twolf@apache.org>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit/internal')
-rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 6def50b17a..fcdce83026 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -259,6 +259,7 @@ deleteFileFailed=Could not delete file {0} deletedOrphanInPackDir=Deleted orphaned file {} deleteRequiresZeroNewId=Delete requires new ID to be zero deleteTagUnexpectedResult=Delete tag returned unexpected result {0} +deletingBranches=Deleting branches... deletingNotSupported=Deleting {0} not supported. depthMustBeAt1=Depth must be >= 1 depthWithUnshallow=Depth and unshallow can\'t be used together @@ -854,6 +855,7 @@ unsupportedReftableVersion=Unsupported reftable version {0}. unsupportedRepositoryDescription=Repository description not supported unsupportedSizesObjSizeIndex=Unsupported sizes in object-size-index updateRequiresOldIdAndNewId=Update requires both old ID and new ID to be nonzero +updatingConfig=Updating git config updatingHeadFailed=Updating HEAD failed updatingReferences=Updating references updatingRefFailed=Updating the ref {0} to {1} failed. ReturnCode from RefUpdate.update() was {2} |