commit - 3a8e4bcba34d9b9ff67cb6f4457a7a43188584fc
commit + 4d982e99055cf01430da8b639924c8b13726090e
blob - 449e7f731351a6e2fc269a37374878eb3f8af5d4
blob + d68c7b013cac6e2a4d5031b65725e3e58fa7c507
--- CHANGES
+++ CHANGES
- tog: add 'L' key to blame view; opens log view for the annotated line (jamsek)
- don't chug along if repo format version is unsupported (florian)
- fix dead stores to variables, found with LLVM's scan-build (florian)
-- fix unitialized error return (florian)
+- fix uninitialized error return (florian)
- make sure got_repo_pack_fds_close() frees a malloc'ed pointer (florian)
- prevent memory leak when asprintf fails (florian)
- prevent use-after-free of packed_refs_path in error path (florian)
- fix bug in findwixt() which caused pack files with missing parent commits
- avoid looping over deltas twice in dump_delta_chain_to_{file,mem}()
- open tempfiles needed for delta application upfront, for future gotwebd
-- reduce GOT_PACK_CACHE_SIZE to 32 to accomodate for previous tempfile change
+- reduce GOT_PACK_CACHE_SIZE to 32 to accommodate for previous tempfile change
- tog: override SIGTERM and SIGINT handlers to avoid ncurses cleanup() handler
- move creation of tempfiles outside of lib/diff.c
- tests: don't pass $ret to test_done on failure when it's known to be zero (op)
* got 0.55; 2021-07-26
- display recovery steps in the lonely pack index error message
-- fix double-free that ocurred upon exit from 'tog tree'; found by naddy
+- fix double-free that occurred upon exit from 'tog tree'; found by naddy
- don't scan pack index offsets for large values if pack file is < 2GB
- new -X option for removing backups created by got rebase and got histedit
- add 'got fetch -X' option for deleting references created by 'got fetch'
- fix error checking in dial_ssh()
- increase pack index cache size from 16 to 64 to improve performance
- fix off-by-one in got_repo_cache_pack() causing the wrong pack to be evicted
-- cap pack file cache size at 1/8 of the current open file desciptor limit
+- cap pack file cache size at 1/8 of the current open file descriptor limit
- when reading a pack index byte-swap fields at compile-time where possible
- diff: reduce duplicate code (kn)
- fix "mandoc -T lint" WARNINGS and ERRORS, add missing word (kn)
blob - 7d5a96f1e25c03524fa8a665ef333fcf3a43fa8f
blob + eac737a98b375d017185d50d231d069f03b358a2
--- TODO
+++ TODO
got:
- Teach 'got merge' to merge changes into an arbitrary subdirectory
of the work tree. This would be nice for merging vendor branches.
- Say you have a branch 'llvm-12' which intially contains a 12.0
+ Say you have a branch 'llvm-12' which initially contains a 12.0
release tree as published by the LLVM project, added to the repository
with a command such as 'got import -b llvm-12'. On the main branch we
would want to merge files from the llvm-12 branch into /usr/src/gnu/llvm
blob - 2aaaecc2e9d45cd6eb0bba01deb76049d231c968
blob + 7864138db9fadd684f9cc01f99ab36941f60e2fd
--- cvg/cvg.c
+++ cvg/cvg.c
int rebase_in_progress, merge_in_progress;
/*
- * Silenty refuse to create merge reference if any histedit, merge,
+ * Silently refuse to create merge reference if any histedit, merge,
* or rebase operation is in progress.
*/
err = got_worktree_histedit_in_progress(&histedit_in_progress,
blob - 1817e3e5ed30160e539643b9331c2c8515ecdd4a
blob + 8a69602e91a117f6b3b1826abfe7737979fbf616
--- got/got.c
+++ got/got.c
int rebase_in_progress, merge_in_progress;
/*
- * Silenty refuse to create merge reference if any histedit, merge,
+ * Silently refuse to create merge reference if any histedit, merge,
* or rebase operation is in progress.
*/
err = got_worktree_histedit_in_progress(&histedit_in_progress,
blob - dfd757252c16a2176bebb823f0fe310ab20cc955
blob + fdd5ca3395a4522727127660cef701281c8cb81c
--- gotd/gotd.h
+++ gotd/gotd.h
};
enum gotd_imsg_type {
- /* An error occured while processing a request. */
+ /* An error occurred while processing a request. */
GOTD_IMSG_ERROR,
/* Commands used by gotctl(8). */
GOTD_IMSG_REF_UPDATES_START, /* Ref updates starting. */
GOTD_IMSG_REF_UPDATE_OK, /* Update went OK. */
GOTD_IMSG_REF_UPDATE_NG, /* Update was not good. */
- GOTD_IMSG_REFS_UPDATED, /* The server proccessed all ref updates. */
+ GOTD_IMSG_REFS_UPDATED, /* The server processed all ref updates. */
/* Client connections. */
GOTD_IMSG_DISCONNECT,
blob - af6fa898b64f8cae67ec5dbd56fe5e7facc9cb1f
blob + 6da90e15b9ff35dc824d937f758399cf194b6dae
--- gotd/libexec/got-notify-http/got-notify-http.c
+++ gotd/libexec/got-notify-http/got-notify-http.c
break;
}
phase = P_PARENT;
- /* fallthough */
+ /* fallthrough */
case P_PARENT:
/* optional - more than one */
break;
}
phase = P_OBJECT;
- /* fallthough */
+ /* fallthrough */
case P_OBJECT:
/* optional */
blob - c285befbcf4f7f53adfe4fe70ef636a4dd1b7671
blob + 419f61bc2cb721f471255c3298511ff707055250
--- include/got_dial.h
+++ include/got_dial.h
* Apply any unveil(2) operations required to support the given protocol,
* as obtained from the 'proto' output parameter of got_dial_parse_uri().
* This function must be called during initialization of the main program
- * if got_fetch.h or got_send.h funcionality will be used.
+ * if got_fetch.h or got_send.h functionality will be used.
*/
const struct got_error *got_dial_apply_unveil(const char *proto);
blob - 49498058010672bb63ea9d190a831fc8226fe241
blob + 3cdd01eba87b65a91beea485fcc804669fa807f3
--- include/got_diff.h
+++ include/got_diff.h
* offsets and types, with nlines > 0 indicating the length of the
* pre-populated array. This is useful if the output file already
* contains some lines of text. The array will be grown as needed to
- * accomodate additional offsets and types, and the last offset found
+ * accommodate additional offsets and types, and the last offset found
* in a pre-populated array will be added to all subsequent offsets.
*/
size_t nlines;
blob - b3626e6cc55a8ad4c5d1b2e62293dafc283a1c05
blob + 0e987a302c6c21819424c0bbf8c957b06744abd8
--- include/got_reference.h
+++ include/got_reference.h
/* Get the name of the reference. */
const char *got_ref_get_name(struct got_reference *);
-/* Get the name of the reference which a symoblic reference points at. */
+/* Get the name of the reference which a symbolic reference points at. */
const char *got_ref_get_symref_target(struct got_reference *);
/* Get the last modification timestamp of the reference. */
/*
* Insert a reference into a reference list.
* Return a pointer to the newly allocated list entry in *newp.
- * If *newp is NULL and no error occured then the specified reference was
+ * If *newp is NULL and no error occurred then the specified reference was
* already an element of the list. If *newp is not NULL then the reference
* was shallow-copied onto the list and should no longer be closed with
* got_ref_close(). Instead it will be closed along with other list
void *cmp_arg);
/* Indicate whether the provided reference is symbolic (points at another
- * refernce) or not (points at an object ID). */
+ * reference) or not (points at an object ID). */
int got_ref_is_symbolic(struct got_reference *);
/* Change the object ID a reference points to. */
blob - 91bfba2775bd8f47a9c55f66b6815495fbc53d7b
blob + c3fa46bbe00087fcbd8a9b114bedd1cabed012d6
--- include/got_worktree.h
+++ include/got_worktree.h
* will be created. The path itself must not yet exist, but the dirname(3)
* of the path must already exist.
* The reference provided will be used to determine the new worktree's
- * base commit. The third argument speficies the work tree's path prefix.
+ * base commit. The third argument specifies the work tree's path prefix.
* The fourth argument specifies the meta data directory to use, which
* should be either GOT_WORKTREE_GOT_DIR or GOT_WORKTREE_CVG_DIR.
*/
const char *, int, int, int, got_worktree_commit_msg_cb, void *,
got_worktree_status_cb, void *, struct got_repository *);
-/* Get the path of a commitable worktree item. */
+/* Get the path of a committable worktree item. */
const char *got_commitable_get_path(struct got_commitable *);
-/* Get the status of a commitable worktree item. */
+/* Get the status of a committable worktree item. */
unsigned int got_commitable_get_status(struct got_commitable *);
/*
/*
* Prepare for getting meta data for paths in the work tree. This
- * function also returns a poniter to a fileindex wihch must be passed
+ * function also returns a pointer to a fileindex which must be passed
* back to other path_info-related functions and *_version() functions.
*/
const struct got_error *
blob - ee01a5c028702fdcfa183487d08b0d679cf20893
blob + 7138820e246e3ba701f04d3dcbb95ff86f67920f
--- lib/blame.c
+++ lib/blame.c
blame->nlines1, blame->line_offsets1);
} else if (d->f == blame->f2) {
if (d->atoms.len > 0) {
- /* Re-use data from previous commit. */
+ /* Reuse data from previous commit. */
return DIFF_RC_OK;
}
if (blame->map2)
blob - a7db1e0a59efcecd2ba2b72df8e1ce42604415d4
blob + 30e62b560a15e5c2d8a460f28b8ea386e1b3b5cf
--- lib/deltify.c
+++ lib/deltify.c
#endif
/*
- * The algorihm used here is FastCDC (Fast Content-Defined Chunking)
+ * The algorithm used here is FastCDC (Fast Content-Defined Chunking)
* https://www.usenix.org/conference/atc16/technical-sessions/presentation/xia
*/
blob - 50f01ee324448ac6a14453532234d56701962df1
blob + 2a3413d75f8c6428f2b2737381dd72723b06f89a
--- lib/got_lib_privsep.h
+++ lib/got_lib_privsep.h
GOT_STRINGVAL(GOT_LIBEXECDIR) "/" GOT_STRINGVAL(GOT_PROG_FETCH_HTTP)
enum got_imsg_type {
- /* An error occured while processing a request. */
+ /* An error occurred while processing a request. */
GOT_IMSG_ERROR,
/* Stop the child process. */
GOT_IMSG_RAW_DELTA_REQUEST,
GOT_IMSG_RAW_DELTA,
- /* Re-use deltas found in a pack file. */
+ /* Reuse deltas found in a pack file. */
GOT_IMSG_DELTA_REUSE_REQUEST,
GOT_IMSG_REUSED_DELTAS,
GOT_IMSG_DELTA_REUSE_DONE,
size_t len;
off_t packfile_size;
int algo;
- /* Additionally, a file desciptor is passed via imsg. */
+ /* Additionally, a file descriptor is passed via imsg. */
};
/* Structure for GOT_IMSG_PACK. */
char path_packfile[PATH_MAX];
off_t filesize;
int algo;
- /* Additionally, a file desciptor is passed via imsg. */
+ /* Additionally, a file descriptor is passed via imsg. */
} __attribute__((__packed__));
/*
blob - a43c93bf01b5cb12693933595ad320101db7fc5b
blob + c91ca76066d628e1d12b7c66d86c8829e1b938be
--- lib/path.c
+++ lib/path.c
if (len1 == len2 && i >= min_len)
return 0;
- /* Skip over redundant trailing path seperators. */
+ /* Skip over redundant trailing path separators. */
while (path1[i] == '/' && path1[i + 1] == '/')
path1++;
while (path2[i] == '/' && path2[i + 1] == '/')
blob - f7bc857b9b977973277020c4b6df2828e8c6bd29
blob + 3b728f8e2874054c0698accbbe24e51d69d93929
--- lib/reference.c
+++ lib/reference.c
struct got_reflist_head refs;
int found_delref = 0;
- /* The packed-refs file does not cotain symbolic references. */
+ /* The packed-refs file does not contain symbolic references. */
if (delref->flags & GOT_REF_IS_SYMBOLIC)
return got_error(GOT_ERR_BAD_REF_DATA);
blob - 55a49c904e9d8a41678453f55fcedc15a081516f
blob + ebba1caf39b7ef4c28dcefcc7bb43a6ec5597c76
--- regress/cmdline/add.sh
+++ regress/cmdline/add.sh
got checkout $testroot/repo $testroot/wt > /dev/null
- # Atttempt to add a file clashes with a submodule
+ # Attempt to add a file clashes with a submodule
echo "This is a file called repo2" > $testroot/wt/repo2
(cd $testroot/wt && got add repo2 > /dev/null)
blob - c03acc526e5de0ab93d6adddd739a9d62026408c
blob + 8ccd872d89efa4e676629a263300d659c3dd6ceb
--- regress/cmdline/checkout.sh
+++ regress/cmdline/checkout.sh
local testroot=`test_init checkout_read_only`
local commit_id=`git_show_head $testroot/repo`
- # Make the repostiory read-only
+ # Make the repository read-only
chmod -R a-w $testroot/repo
echo "A $testroot/wt/alpha" > $testroot/stdout.expected
blob - 11fb8635050e0db41a982075ae634e1ecadb0b6b
blob + 10fb0048365946712e681a7ed28248f0257ace2e
--- regress/cmdline/common.sh
+++ regress/cmdline/common.sh
git_init $repo
echo "this is file $file" > $repo/$file
git -C $repo add .
- git_commit $repo -m "intialize $repo with file $file"
+ git_commit $repo -m "initialize $repo with file $file"
}
get_loose_object_path()
blob - 43c4a8b4c2b0d6b7faedd25e5cc9f3cb3bfed8fa
blob + 884ba874302b4e95327b6a03d633122a2757442a
--- regress/cmdline/patch.sh
+++ regress/cmdline/patch.sh
2> $testroot/stderr
ret=$?
if [ $ret -eq 0 ]; then
- echo "got patch suceeded unexpectedly" >&2
+ echo "got patch succeeded unexpectedly" >&2
test_done $testroot $ret
return 1
fi
2> $testroot/stderr
ret=$?
if [ $ret -eq 0 ]; then
- echo "got patch suceeded unexpectedly" >&2
+ echo "got patch succeeded unexpectedly" >&2
test_done $testroot $ret
return 1
fi
blob - c824aaf0100a26fa4d112f62f5136272c5c82bbc
blob + 84c24828bea9475f7b0841d4f7fe0ffec5264646
--- regress/cmdline/rebase.sh
+++ regress/cmdline/rebase.sh
2> $testroot/stderr)
ret=$?
if [ $ret -ne 0 ]; then
- echo "rebase comand failed unexpectedly" >&2
+ echo "rebase command failed unexpectedly" >&2
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "1"
return 1
2> $testroot/stderr)
ret=$?
if [ $ret -ne 0 ]; then
- echo "merge comand failed unexpectedly" >&2
+ echo "merge command failed unexpectedly" >&2
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "1"
return 1
2> $testroot/stderr)
ret=$?
if [ $ret -ne 0 ]; then
- echo "merge comand failed unexpectedly" >&2
+ echo "merge command failed unexpectedly" >&2
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "1"
return 1
blob - a2518bf858a18dbc66fcb6ad278ee0cfc54f9a8c
blob + 0709a766c3b43610a20290c1e889d0ba50846d4c
--- regress/gotd/README
+++ regress/gotd/README
The test suite uses netcat on port 2525 to test SMTP notifications.
If this port is already in use then affected tests might fail.
-If needed the port can be overriden on the make command line:
+If needed the port can be overridden on the make command line:
$ doas make server-regress GOTD_TEST_SMTP_PORT=12345
