brz-git

Merge lp:~jelmer/brz-git/cleanup-mode into lp:brz-git

  1. cleanup-mode
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 1896
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz-git/cleanup-mode
Merge into: lp:brz-git
Diff against target: 12 lines (+1/-1)
1 file modified
workingtree.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz-git/cleanup-mode
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+342166@code.launchpad.net

Commit message

Call cleanup mode for extra entries.

Description of the change

Call cleanup mode for extra entries.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Rubberstamp! Proposer approves of own proposal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'workingtree.py'
2--- workingtree.py 2018-03-26 00:30:51 +0000
3+++ workingtree.py 2018-03-27 01:51:56 +0000
4@@ -1249,7 +1249,7 @@
5 blob = blob_from_path_and_stat(ap.encode('utf-8'), st)
6 store.add_object(blob)
7 np = np.encode('utf-8')
8- blobs[np] = (blob.id, st.st_mode)
9+ blobs[np] = (blob.id, cleanup_mode(st.st_mode))
10 extras.add(np)
11 to_tree_sha = commit_tree(store, dirified + [(p, s, m) for (p, (s, m)) in blobs.iteritems()])
12 return store.tree_changes(

Subscribers

People subscribed via source and target branches

to all changes: